core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0142-Cap-Entity-Collisions....

61 lines
2.7 KiB
Diff
Raw Normal View History

Ensure portal search radius is used when teleporting players (#2877) Also add the create search radius mojang recently introduced to config
2020-01-18 17:28:32 +00:00
From c18a30b8936217bab75d84459f912ce82990eb7d Mon Sep 17 00:00:00 2001
Cap Entity Collisions - Resolves #577 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.
2017-01-22 23:24:14 +00: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
Ensure portal search radius is used when teleporting players (#2877) Also add the create search radius mojang recently introduced to config
2020-01-18 17:28:32 +00:00
index f164844f3..751551f17 100644
Cap Entity Collisions - Resolves #577 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.
2017-01-22 23:24:14 +00:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
Ensure portal search radius is used when teleporting players (#2877) Also add the create search radius mojang recently introduced to config
2020-01-18 17:28:32 +00:00
@@ -322,4 +322,10 @@ public class PaperWorldConfig {
NOT FINISHED! 1.13-pre7 - even more patches! Patches, patches everywhere!
2018-07-18 00:08:13 +00:00
log("Treasure Maps will return already discovered locations");
}
Cap Entity Collisions - Resolves #577 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.
2017-01-22 23:24:14 +00: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
Ensure portal search radius is used when teleporting players (#2877) Also add the create search radius mojang recently introduced to config
2020-01-18 17:28:32 +00:00
index 764e779b1..9c1607377 100644
Cap Entity Collisions - Resolves #577 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.
2017-01-22 23:24:14 +00:00
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
Patches 100-260 (#2729)
2019-12-11 23:43:22 +00:00
@@ -189,6 +189,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
Cap Entity Collisions - Resolves #577 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.
2017-01-22 23:24:14 +00:00
public final boolean defaultActivationState;
public long activatedTick = Integer.MIN_VALUE;
Update upstream CB/S
2017-06-11 17:03:07 +00:00
public boolean fromMobSpawner;
Cap Entity Collisions - Resolves #577 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.
2017-01-22 23:24:14 +00: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
Ensure portal search radius is used when teleporting players (#2877) Also add the create search radius mojang recently introduced to config
2020-01-18 17:28:32 +00:00
index be85a76ac..6379b361a 100644
Cap Entity Collisions - Resolves #577 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.
2017-01-22 23:24:14 +00:00
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
Patches 100-260 (#2729)
2019-12-11 23:43:22 +00:00
@@ -2621,8 +2621,11 @@ public abstract class EntityLiving extends Entity {
Cap Entity Collisions - Resolves #577 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.
2017-01-22 23:24:14 +00: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
Patches 100-260 (#2729)
2019-12-11 23:43:22 +00:00
this.C(entity);
Cap Entity Collisions - Resolves #577 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.
2017-01-22 23:24:14 +00:00
}
--
Ensure portal search radius is used when teleporting players (#2877) Also add the create search radius mojang recently introduced to config
2020-01-18 17:28:32 +00:00
2.25.0.windows.1
Cap Entity Collisions - Resolves #577 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.
2017-01-22 23:24:14 +00:00