Retain BoundingBoxEvent instance

Author: ZeroMemes

src/main/java/clientapi/event/defaults/game/world/BoundingBoxEvent.java

@@ -25,23 +25,28 @@
 import java.util.List;
 
 /**
- * Called from Block#addCollisionBoxToList(BlockPos, AxisAlignedBB, List, AxisAlignedBB).
+ * Called from {@link Block#addCollisionBoxToList(BlockPos, AxisAlignedBB, List, AxisAlignedBB)}.
  * Used to hook into block collision, used to modify the bounding boxes of blocks.
  *
  * @author Brady
  * @since 4/10/2017
  */
 public final class BoundingBoxEvent {
 
+    /**
+     * Singleton instance of this event
+     */
+    private static final BoundingBoxEvent EVENT = new BoundingBoxEvent();
+
     /**
      * The block itself
      */
-    private final Block block;
+    private Block block;
 
     /**
      * The position of the block
      */
-    private final BlockPos pos;
+    private BlockPos pos;
 
     /**
      * The bounding box of the block
@@ -51,20 +56,12 @@ public final class BoundingBoxEvent {
     /**
      * Colliding list being added onto
      */
-    private final List<AxisAlignedBB> collidingBoxes;
+    private List<AxisAlignedBB> collidingBoxes;
 
     /**
      * Entity being checked, may be {@code null}
      */
-    private final Entity entity;
-
-    public BoundingBoxEvent(Block block, BlockPos pos, AxisAlignedBB aabb, List<AxisAlignedBB> collidingBoxes, @Nullable Entity entity) {
-        this.block = block;
-        this.pos = pos;
-        this.aabb = aabb;
-        this.collidingBoxes = collidingBoxes;
-        this.entity = entity;
-    }
+    private Entity entity;
 
     /**
      * Sets the block's bounding box. Setting it to
@@ -123,4 +120,13 @@ public String toString() {
                 ", entity=" + entity +
                 '}';
     }
+
+    public static BoundingBoxEvent get(Block block, BlockPos pos, AxisAlignedBB aabb, List<AxisAlignedBB> collidingBoxes, @Nullable Entity entity) {
+        EVENT.block = block;
+        EVENT.pos = pos;
+        EVENT.aabb = aabb;
+        EVENT.collidingBoxes = collidingBoxes;
+        EVENT.entity = entity;
+        return EVENT;
+    }
 }

src/main/java/clientapi/load/mixin/MixinBlock.java

@@ -64,7 +64,7 @@ private void canCollideCheck(IBlockState state, boolean hitIfLiquid, CallbackInf
     private void addCollisionBox(IBlockState state, World world, BlockPos pos, AxisAlignedBB entityBox, List<AxisAlignedBB> collidingBoxes, @Nullable Entity entity, boolean isActualState, CallbackInfo ci) {
         synchronized (this) {
             Block block = (Block) (Object) (this);
-            bbEvent = new BoundingBoxEvent(block, pos, block.getCollisionBoundingBox(state, world, pos), collidingBoxes, entity);
+            bbEvent = BoundingBoxEvent.get(block, pos, block.getCollisionBoundingBox(state, world, pos), collidingBoxes, entity);
             ClientAPI.EVENT_BUS.post(bbEvent);
         }
     }