diff --git a/src/main/java/catserver/server/CatServerConfig.java b/src/main/java/catserver/server/CatServerConfig.java index e1e1ea8e1..20c350f99 100644 --- a/src/main/java/catserver/server/CatServerConfig.java +++ b/src/main/java/catserver/server/CatServerConfig.java @@ -113,13 +113,10 @@ public void loadConfig() { releaseUseItemThrottle = getOrWriteIntConfig("network.packetLimit.releaseUseItemThrottle", releaseUseItemThrottle); disableFMLHandshake = getOrWriteBooleanConfig("network.fml.disableHandshake", config.getBoolean("disableFMLHandshake", disableFMLHandshake)); disableFMLStatusModInfo = getOrWriteBooleanConfig("network.fml.disableStatusModInfo", config.getBoolean("disableFMLStatusModInfo", disableFMLStatusModInfo)); - // Event bridge // CatRoom start - Handle mod explosion event + // event bridge bridgeForgeExplosionEventToBukkit = getOrWriteBooleanConfig("event-bridge.bridgeForgeExplosionEventToBukkit", bridgeForgeExplosionEventToBukkit); - // CatRoom end - Handle mod explosion event - // CatRoom start - Call construct and capability event on respawn // compatibility callConstructCapabilityEventOnRespawn = getOrWriteBooleanConfig("compatibility.callConstructCapabilityEventOnRespawn", callConstructCapabilityEventOnRespawn); - // CatRoom end - Call construct and capability event on respawn // general disableUpdateGameProfile = getOrWriteBooleanConfig("disableUpdateGameProfile", disableUpdateGameProfile); disableAsyncCatchWarn = getOrWriteBooleanConfig("disableAsyncCatchWarn", disableAsyncCatchWarn); diff --git a/src/main/java/catserver/server/CatServerEventHandler.java b/src/main/java/catserver/server/CatServerEventHandler.java index 8ce3ca0f1..54209fe82 100644 --- a/src/main/java/catserver/server/CatServerEventHandler.java +++ b/src/main/java/catserver/server/CatServerEventHandler.java @@ -64,7 +64,6 @@ public void onExplosionDetonate(ExplosionEvent.Detonate event) { Location location = new Location(bworld, explosionPos.x, explosionPos.y, explosionPos.z); List bukkitBlocks; boolean cancelled; - float yield; final List blockList = Lists.newArrayList(); List affectedBlockPositions = event.getAffectedBlocks(); for (int i1 = affectedBlockPositions.size() - 1; i1 >= 0; i1--) { @@ -79,13 +78,11 @@ public void onExplosionDetonate(ExplosionEvent.Detonate event) { Bukkit.getServer().getPluginManager().callEvent(bukkitEvent); cancelled = bukkitEvent.isCancelled(); bukkitBlocks = bukkitEvent.blockList(); - yield = bukkitEvent.getYield(); } else { BlockExplodeEvent bukkitEvent = new BlockExplodeEvent(location.getBlock(), blockList, 1.0F / explosion.size); Bukkit.getServer().getPluginManager().callEvent(bukkitEvent); cancelled = bukkitEvent.isCancelled(); bukkitBlocks = bukkitEvent.blockList(); - yield = bukkitEvent.getYield(); } explosion.getAffectedBlockPositions().clear(); @@ -97,7 +94,6 @@ public void onExplosionDetonate(ExplosionEvent.Detonate event) { BlockPos coords = new BlockPos(bblock.getX(), bblock.getY(), bblock.getZ()); explosion.getAffectedBlockPositions().add(coords); } - explosion.size = yield * explosion.size; } } }