Lukas A / Spigot / f09019bf81b

Commits

md_5 authored f09019bf81b 10 Jul 2016

Rebuild patches.

Tags

No tags

7745d45de92

master

Download source

CraftBukkit-Patches/0068-Cap-Entity-Collisions.patch

Modified

--
+From a3990718d6c910916bbff7590a9d64b4226068b0 Mon Sep 17 00:00:00 2001
-+
+From 9539fba8667de25c6c2ff6b33314f7522de4d4e1 Mon Sep 17 00:00:00 2001
-2
+From: Aikar <aikar@aikar.co>
-3
+Date: Fri, 31 Jan 2014 11:18:34 -0500
-4
+Subject: [PATCH] Cap Entity Collisions
-5
-6
+Limit a single entity to colliding a max of configurable times per tick.
-7
+This will alleviate issues where living entities are hoarded in 1x1 pens.
-8
-9
+diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-10
+index 875dbb9..4427af9 100644
-11
+--- a/src/main/java/net/minecraft/server/Entity.java
-12
++++ b/src/main/java/net/minecraft/server/Entity.java
-13
+@@ -149,6 +149,7 @@ public abstract class Entity implements ICommandListener {
-14
+     public long activatedTick = Integer.MIN_VALUE;
-15
+     public boolean fromMobSpawner;
-16
+     public void inactiveTick() { }
-17
++    protected int numCollisions = 0;
-18
+     // Spigot end
-19
-20
+     public Entity(World world) {
-21
+diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
--
+index 05a7c9a..a32e453 100644
-+
+index 780334f..df72e07 100644
-23
+--- a/src/main/java/net/minecraft/server/EntityLiving.java
-24
++++ b/src/main/java/net/minecraft/server/EntityLiving.java
--
+@@ -2026,7 +2026,8 @@ public abstract class EntityLiving extends Entity {
-+
+@@ -2026,9 +2026,14 @@ public abstract class EntityLiving extends Entity {
-26
+         List list = this.world.getEntities(this, this.getBoundingBox(), IEntitySelector.a(this));
-27
-28
+         if (!list.isEmpty()) {
-29
+-            for (int i = 0; i < list.size(); ++i) {
-30
++                numCollisions = Math.max(0, numCollisions - world.spigotConfig.maxCollisionsPerEntity); // Spigot
-31
++                for (int i = 0; i < list.size() && numCollisions < world.spigotConfig.maxCollisionsPerEntity; ++i) {
-32
+                 Entity entity = (Entity) list.get(i);
--
+                 // TODO better check now?
--
+                 // CraftBukkit start - Only handle mob (non-player) collisions every other tick
--
+@@ -2035,7 +2036,8 @@ public abstract class EntityLiving extends Entity {
--
+                 }
--
+                 // CraftBukkit end
-33
 -
--
++                entity.numCollisions++; // Spigot
--
++                numCollisions++; // Spigot
-+
++                // Spigot start
-+
++                entity.numCollisions++;
-+
++                numCollisions++;
-+
++                // Spigot end
-38
+                 this.C(entity);
-39
+             }
-40
+         }
-41
+diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-42
+index 4ea200d..0a6bbba 100644
-43
+--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
-44
++++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-45
+@@ -224,4 +224,11 @@ public class SpigotWorldConfig
-46
+         enableZombiePigmenPortalSpawns = getBoolean( "enable-zombie-pigmen-portal-spawns", true );
-47
+         log( "Allow Zombie Pigmen to spawn from portal blocks: " + enableZombiePigmenPortalSpawns );

Spigot

Commits

Jira Issues

Add shortcut