Skip to content

Dont handle explosion yield process #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HaHaWTH merged 3 commits into from
Dec 28, 2024
Merged

Dont handle explosion yield process #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9263d0
Remove diff comment
HaHaWTH Dec 26, 2024
de6d3c8
Merge remote-tracking branch 'origin/bouncedpad' into bouncedpad
HaHaWTH Dec 26, 2024
662ccdf
Do not handle yield process
HaHaWTH Dec 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/main/java/catserver/server/CatServerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/catserver/server/CatServerEventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ public void onExplosionDetonate(ExplosionEvent.Detonate event) {
Location location = new Location(bworld, explosionPos.x, explosionPos.y, explosionPos.z);
List<Block> bukkitBlocks;
boolean cancelled;
float yield;
final List<Block> blockList = Lists.newArrayList();
List<BlockPos> affectedBlockPositions = event.getAffectedBlocks();
for (int i1 = affectedBlockPositions.size() - 1; i1 >= 0; i1--) {
Expand All @@ -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();

Expand All @@ -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;
}
}
}
Expand Down
Loading