2019-05-27 17:13:41 +08:00
|
|
|
From a81213ba21250a6959d78fa7412104ac7291492e Mon Sep 17 00:00:00 2001
|
2017-01-23 07:24:14 +08:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Sun, 22 Jan 2017 18:07:56 -0500
|
|
|
|
Subject: [PATCH] Cap Entity Collisions
|
|
|
|
|
|
|
|
Limit a single entity to colliding a max of configurable times per tick.
|
|
|
|
This will alleviate issues where living entities are hoarded in 1x1 pens
|
|
|
|
|
|
|
|
This is not tied to the maxEntityCramming rule. Cramming will still apply
|
|
|
|
just as it does in Vanilla, but entity pushing logic will be capped.
|
|
|
|
|
|
|
|
You can set this to 0 to disable collisions.
|
|
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2019-05-27 17:13:41 +08:00
|
|
|
index 406bc611c..58fe5a8c4 100644
|
2017-01-23 07:24:14 +08:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2019-04-27 14:26:04 +08:00
|
|
|
@@ -320,4 +320,10 @@ public class PaperWorldConfig {
|
2018-07-18 08:08:13 +08:00
|
|
|
log("Treasure Maps will return already discovered locations");
|
|
|
|
}
|
2017-01-23 07:24:14 +08:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public int maxCollisionsPerEntity;
|
|
|
|
+ private void maxEntityCollision() {
|
|
|
|
+ maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
|
|
|
|
+ log( "Max Entity Collisions: " + maxCollisionsPerEntity );
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
2019-05-27 17:13:41 +08:00
|
|
|
index c649507c8..596804637 100644
|
2017-01-23 07:24:14 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
2019-05-06 10:58:04 +08:00
|
|
|
@@ -184,6 +184,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
2017-01-23 07:24:14 +08:00
|
|
|
public final boolean defaultActivationState;
|
|
|
|
public long activatedTick = Integer.MIN_VALUE;
|
2017-06-12 01:03:07 +08:00
|
|
|
public boolean fromMobSpawner;
|
2017-01-23 07:24:14 +08:00
|
|
|
+ protected int numCollisions = 0; // Paper
|
|
|
|
public void inactiveTick() { }
|
|
|
|
// Spigot end
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
2019-05-27 17:13:41 +08:00
|
|
|
index 6df98f845..1603a9b5e 100644
|
2017-01-23 07:24:14 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
2019-04-27 14:26:04 +08:00
|
|
|
@@ -2553,8 +2553,11 @@ public abstract class EntityLiving extends Entity {
|
2017-01-23 07:24:14 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
- for (j = 0; j < list.size(); ++j) {
|
|
|
|
+ numCollisions = Math.max(0, numCollisions - world.paperConfig.maxCollisionsPerEntity); // Paper
|
|
|
|
+ for (j = 0; j < list.size() && numCollisions < world.paperConfig.maxCollisionsPerEntity; ++j) { // Paper
|
|
|
|
Entity entity = (Entity) list.get(j);
|
|
|
|
+ entity.numCollisions++; // Paper
|
|
|
|
+ numCollisions++; // Paper
|
|
|
|
|
2019-04-27 14:26:04 +08:00
|
|
|
this.D(entity);
|
2017-01-23 07:24:14 +08:00
|
|
|
}
|
|
|
|
--
|
2019-04-05 12:52:02 +08:00
|
|
|
2.21.0
|
2017-01-23 07:24:14 +08:00
|
|
|
|