Paper/CraftBukkit-Patches/0078-Cap-Entity-Collisions.patch

66 lines
2.6 KiB
Diff
Raw Normal View History

2015-06-01 11:22:52 +02:00
From e8321494f95fcddb4f3f924bc00772d08cf24e56 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 31 Jan 2014 11:18:34 -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.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
2015-02-28 12:36:22 +01:00
index b930c0d..82accf4 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
2015-02-28 12:36:22 +01:00
@@ -1052,6 +1052,7 @@ public abstract class Entity implements ICommandListener {
2014-11-28 02:17:45 +01:00
public void d(EntityHuman entityhuman) {}
+ int numCollisions = 0; // Spigot
public void collide(Entity entity) {
if (entity.passenger != this && entity.vehicle != this) {
2015-02-28 12:36:22 +01:00
if (!entity.noclip && !this.noclip) {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
2015-05-09 22:23:26 +02:00
index 9cd8e9b..0e2f64f 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
2015-04-09 05:45:13 +02:00
@@ -1675,7 +1675,9 @@ public abstract class EntityLiving extends Entity {
2015-02-28 12:36:22 +01:00
}));
2015-02-28 12:36:22 +01:00
if (this.ad() && !list.isEmpty()) { // Spigot: Add this.ad() condition
+ numCollisions -= world.spigotConfig.maxCollisionsPerEntity; // Spigot
for (int i = 0; i < list.size(); ++i) {
+ if (numCollisions > world.spigotConfig.maxCollisionsPerEntity) { break; } // Spigot
Entity entity = (Entity) list.get(i);
2015-02-28 12:36:22 +01:00
// TODO better check now?
2015-04-09 05:45:13 +02:00
@@ -1685,8 +1687,11 @@ public abstract class EntityLiving extends Entity {
2015-02-28 12:36:22 +01:00
}
// CraftBukkit end
2015-02-28 12:36:22 +01:00
+ entity.numCollisions++; // Spigot
+ numCollisions++; // Spigot
this.s(entity);
}
+ numCollisions = 0; // Spigot
}
2014-11-28 02:17:45 +01:00
}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index ede9250..c652cc5 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -275,4 +275,11 @@ public class SpigotWorldConfig
2014-11-28 02:17:45 +01:00
maxBulkChunk = getInt( "max-bulk-chunks", 10 );
log( "Sending up to " + maxBulkChunk + " chunks per packet" );
}
+
+ public int maxCollisionsPerEntity;
+ private void maxEntityCollision()
+ {
+ maxCollisionsPerEntity = getInt( "max-entity-collisions", 8 );
+ log( "Max Entity Collisions: " + maxCollisionsPerEntity );
+ }
}
--
2015-05-09 22:23:26 +02:00
2.1.4