Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-26 02:19:23 +00:00
Code Issues Releases Activity

dev

Browse Source
This commit is contained in:
jhqwqmc
2025-12-22 05:26:54 +08:00
parent 23375d7b0e
commit 3a82fbfb9c
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/BukkitNetworkManager.java
View File

@@ -3963,6 +3963,7 @@ public class BukkitNetworkManager implements NetworkManager, Listener {
return;
FurnitureBreakEvent breakEvent = new FurnitureBreakEvent(serverPlayer.platformPlayer(), furniture);
breakEvent.setDropItems(!serverPlayer.isCreativeMode());
if (EventUtils.fireAndCheckCancel(breakEvent))
return;
@@ -3981,7 +3982,7 @@ public class BukkitNetworkManager implements NetworkManager, Listener {
return;
}
CraftEngineFurniture.remove(furniture, serverPlayer, !serverPlayer.isCreativeMode(), true);
CraftEngineFurniture.remove(furniture, serverPlayer, breakEvent.dropItems(), true);
};
} else if (actionType == 2) {
// INTERACT_AT

16
core/src/main/java/net/momirealms/craftengine/core/plugin/locale/TranslationManagerImpl.java
View File

@@ -308,9 +308,19 @@ public class TranslationManagerImpl implements TranslationManager {
Map<String, String> bundle = new HashMap<>();
for (Map.Entry<String, Object> entry : section.entrySet()) {
String key = entry.getKey();
bundle.put(key, entry.getValue().toString());
TranslationManagerImpl.this.translationKeys.add(key);
StringBuilder key = new StringBuilder(entry.getKey());
Object value = entry.getValue();
for (;;) {
if (!(value instanceof Map<?,?> map)) {
value = entry.getValue();
break;
}
Map.Entry<?, ?> next = map.entrySet().iterator().next();
key.append(".").append(next.getKey());
value = next.getValue();
}
bundle.put(key.toString(), String.valueOf(value));
TranslationManagerImpl.this.translationKeys.add(key.toString());
this.count++;
}