Merge pull request #5 from HaHaWTH/main

Handle mod explosion event and pass to Bukkit properly

Author: KasumiNova

patches/minecraft/net/minecraft/world/Explosion.java.patch

@@ -33,10 +33,11 @@
      private final double field_77285_c;
      private final double field_77282_d;
 -    private final Entity field_77283_e;
-+    public final Entity field_77283_e;
-     private final float field_77280_f;
+-    private final float field_77280_f;
 -    private final List<BlockPos> field_77281_g = Lists.newArrayList();
 -    private final Map<EntityPlayer, Vec3d> field_77288_k = Maps.newHashMap();
++    public final Entity field_77283_e;
++    public float field_77280_f; // CatRoom - private final -> public
 +    private final List<BlockPos> field_77281_g;
 +    private final Map<EntityPlayer, Vec3d> field_77288_k;
 +    private final Vec3d position;

src/main/java/catserver/server/CatServerConfig.java

@@ -48,6 +48,8 @@ public class CatServerConfig {
 
     public boolean waitForgeServerChatEvent = false;
 
+    public boolean bridgeForgeExplosionEventToBukkit = true; // CatRoom
+
     public int craftRequestThrottle = 20;
     public int itemNBTThrottle = 200;
     public boolean limitFastClickGUI = false;
@@ -109,6 +111,9 @@ 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
+        bridgeForgeExplosionEventToBukkit = getOrWriteBooleanConfig("event-bridge.bridgeForgeExplosionEventToBukkit", bridgeForgeExplosionEventToBukkit);
+        // CatRoom end - Handle mod explosion event
         // general
         disableUpdateGameProfile = getOrWriteBooleanConfig("disableUpdateGameProfile", disableUpdateGameProfile);
         disableAsyncCatchWarn = getOrWriteBooleanConfig("disableAsyncCatchWarn", disableAsyncCatchWarn);

src/main/java/catserver/server/CatServerEventHandler.java

@@ -1,24 +1,35 @@
 package catserver.server;
 
+import com.google.common.collect.Lists;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.EnumActionResult;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.Explosion;
 import net.minecraftforge.common.util.BlockSnapshot;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.event.world.BlockEvent;
+import net.minecraftforge.event.world.ExplosionEvent;
 import net.minecraftforge.fml.common.eventhandler.EventPriority;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.PlayerEvent;
 import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.craftbukkit.v1_12_R1.block.CraftBlockState;
 import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_12_R1.event.CraftEventFactory;
 import org.bukkit.event.Event;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockExplodeEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.player.PlayerChangedWorldEvent;
 
 import java.util.ArrayList;
@@ -40,6 +51,57 @@ public void onBlockBreak(BlockEvent.BreakEvent event) {
         bukkitBlockBreakEventCapture.put(bukkitEvent);
     }
 
+    // CatRoom start - Handle mod explosion event
+    @SubscribeEvent(priority = EventPriority.HIGHEST)
+    public void onExplode(ExplosionEvent.Detonate event) {
+        if (!CatServer.getConfig().bridgeForgeExplosionEventToBukkit) return;
+        Explosion explosion = event.getExplosion();
+        if (explosion.getClass() != Explosion.class) {
+            Entity exploder = explosion.exploder;
+            World bworld = event.getWorld().getWorld();
+            Vec3d explosionPos = explosion.getPosition();
+            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--) {
+                BlockPos cpos = affectedBlockPositions.get(i1);
+                Block bblock = bworld.getBlockAt(cpos.getX(), cpos.getY(), cpos.getZ());
+                if (bblock.getType() != Material.AIR) {
+                    blockList.add(bblock);
+                }
+            }
+            if (exploder != null) {
+                EntityExplodeEvent bukkitEvent = new EntityExplodeEvent(exploder.getBukkitEntity(), location , blockList, 1.0F / explosion.size);
+                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();
+
+            if (cancelled) {
+                event.getAffectedEntities().clear();
+                explosion.wasCanceled = true;
+            } else {
+                for (Block bblock : bukkitBlocks) {
+                    BlockPos coords = new BlockPos(bblock.getX(), bblock.getY(), bblock.getZ());
+                    explosion.getAffectedBlockPositions().add(coords);
+                }
+                explosion.size = yield * explosion.size;
+            }
+        }
+    }
+    // CatRoom end - Handle mod explosion event
+
     @SubscribeEvent(priority = EventPriority.HIGHEST)
     public void onBlockPlace(BlockEvent.PlaceEvent event) {
         BlockPos clickPos = event.direction != null ? event.getBlockSnapshot().getPos().offset(event.direction.getOpposite()) : event.getPos();