Close #280

railcraft-reborn · Feb 1, 2025 · ffdd28d · ffdd28d
1 parent 77364db
commit ffdd28d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/mods/railcraft/world/entity/vehicle/MinecartHandler.java b/src/main/java/mods/railcraft/world/entity/vehicle/MinecartHandler.java
@@ -8,6 +8,7 @@
 import mods.railcraft.util.EntitySearcher;
 import mods.railcraft.util.ModEntitySelector;
 import mods.railcraft.world.level.block.RailcraftBlocks;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntitySelector;
 import net.minecraft.world.entity.LivingEntity;
@@ -16,6 +17,7 @@
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.entity.vehicle.AbstractMinecart;
+import net.minecraft.world.level.GameRules;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.common.IMinecartCollisionHandler;
@@ -41,6 +43,7 @@ public void onEntityCollision(AbstractMinecart cart, Entity other) {
         || !other.isAlive() || !cart.isAlive()) {
       return;
     }
+    var serverLevel = (ServerLevel) level;
 
     var rollingStock = RollingStock.getOrThrow(cart);
 
@@ -84,7 +87,8 @@ public void onEntityCollision(AbstractMinecart cart, Entity other) {
           .around(cart)
           .and(EntitySelector.ENTITY_STILL_ALIVE, ModEntitySelector.NON_MECHANICAL)
           .list(level);
-      if (carts.size() >= 12) {
+      var maxEntityCramming = serverLevel.getGameRules().getInt(GameRules.RULE_MAX_ENTITY_CRAMMING);
+      if (carts.size() >= maxEntityCramming) {
         rollingStock.primeExplosion();
       }
     }