From a4f066ccea069da8ff950ecf52e42e20234f41df Mon Sep 17 00:00:00 2001 From: DrHenchman Date: Sun, 12 Apr 2020 16:41:57 +1000 Subject: [PATCH] Fix method profiler inbalance introduced in a2a9ffe (#3132) Fixes #3131 --- .../0425-Activation-Range-Improvements.patch | 29 ++++++++++--------- ...x-items-vanishing-through-end-portal.patch | 8 ++--- ...n-to-nerf-pigmen-from-nether-portals.patch | 14 ++++----- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/Spigot-Server-Patches/0425-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0425-Activation-Range-Improvements.patch index 673c629df..de6b28e63 100644 --- a/Spigot-Server-Patches/0425-Activation-Range-Improvements.patch +++ b/Spigot-Server-Patches/0425-Activation-Range-Improvements.patch @@ -1,4 +1,4 @@ -From b8bdaa2d7bf5cd8c85ddd82c7238113f1e6ecadc Mon Sep 17 00:00:00 2001 +From 545151172cb24ae45f5eb924083e8d4088b72d57 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 13 May 2016 01:38:06 -0400 Subject: [PATCH] Activation Range Improvements @@ -10,7 +10,7 @@ Fixes and adds new Immunities to improve gameplay behavior Adds water Mobs to activation range config and nerfs fish diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 0900db052d..a550a81bea 100644 +index 0900db05..6509463e 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -192,6 +192,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -29,20 +29,21 @@ index 0900db052d..a550a81bea 100644 vec3d = this.a(vec3d); if (vec3d.equals(Vec3D.a)) { return; -@@ -565,6 +567,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -565,6 +567,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke this.y = Vec3D.a; this.setMot(Vec3D.a); } + // Paper start - ignore movement changes while inactive. + if (isTemporarilyActive && !(this instanceof EntityItem) && vec3d == getMot() && enummovetype == EnumMoveType.SELF) { + setMot(Vec3D.a); ++ this.world.getMethodProfiler().exit(); + return; + } + // Paper end vec3d = this.a(vec3d, enummovetype); Vec3D vec3d1 = this.e(vec3d); -@@ -2765,6 +2773,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -2765,6 +2774,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke return this.am; } @@ -51,7 +52,7 @@ index 0900db052d..a550a81bea 100644 // Paper start return this.pushedByWater(); diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java -index b40c8d2f83..4eda130750 100644 +index b40c8d2f..4eda1307 100644 --- a/src/main/java/net/minecraft/server/EntityCreature.java +++ b/src/main/java/net/minecraft/server/EntityCreature.java @@ -7,6 +7,7 @@ import org.bukkit.event.entity.EntityUnleashEvent; @@ -63,7 +64,7 @@ index b40c8d2f83..4eda130750 100644 protected EntityCreature(EntityTypes entitytypes, World world) { super(entitytypes, world); diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 6d53254f83..1991cee43d 100644 +index 6d53254f..1991cee4 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -114,6 +114,17 @@ public abstract class EntityInsentient extends EntityLiving { @@ -85,7 +86,7 @@ index 6d53254f83..1991cee43d 100644 if (this.isPassenger() && this.getVehicle() instanceof EntityInsentient) { EntityInsentient entityinsentient = (EntityInsentient) this.getVehicle(); diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java -index 6d4d41c88c..193dbfc5f6 100644 +index 6d4d41c8..193dbfc5 100644 --- a/src/main/java/net/minecraft/server/EntityLlama.java +++ b/src/main/java/net/minecraft/server/EntityLlama.java @@ -382,6 +382,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn @@ -97,7 +98,7 @@ index 6d4d41c88c..193dbfc5f6 100644 return this.bJ != null; } diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java -index f22f12eeb0..bdb90a3466 100644 +index f22f12ee..bdb90a34 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java @@ -20,7 +20,10 @@ public abstract class PathfinderGoal { @@ -113,7 +114,7 @@ index f22f12eeb0..bdb90a3466 100644 public void e() {} diff --git a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java -index 41fb166ce0..e93129f0b2 100644 +index 41fb166c..e93129f0 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java @@ -4,12 +4,12 @@ import java.util.EnumSet; @@ -154,7 +155,7 @@ index 41fb166ce0..e93129f0b2 100644 } } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java -index 44bb18c594..935136771e 100644 +index 44bb18c5..93513677 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java @@ -24,10 +24,11 @@ public class PathfinderGoalSelector { @@ -198,7 +199,7 @@ index 44bb18c594..935136771e 100644 this.d.stream().filter((pathfindergoalwrapped) -> { return pathfindergoalwrapped.j() == pathfindergoal; diff --git a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java -index 5a8c60ad90..29657fed75 100644 +index 5a8c60ad..29657fed 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java @@ -64,6 +64,7 @@ public class PathfinderGoalWrapped extends PathfinderGoal { @@ -210,7 +211,7 @@ index 5a8c60ad90..29657fed75 100644 return this.c; } diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 92601c581c..795817177a 100644 +index 92601c58..79581717 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -3,11 +3,15 @@ package org.spigotmc; @@ -472,7 +473,7 @@ index 92601c581c..795817177a 100644 isActive = false; } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 5e932a5d97..1b42ba94c0 100644 +index 5e932a5d..1b42ba94 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -180,6 +180,7 @@ public class SpigotWorldConfig @@ -492,5 +493,5 @@ index 5e932a5d97..1b42ba94c0 100644 log( "Entity Activation Range: An " + animalActivationRange + " / Mo " + monsterActivationRange + " / Ra " + raiderActivationRange + " / Mi " + miscActivationRange + " / Tiv " + tickInactiveVillagers ); } -- -2.25.1 +2.26.0 diff --git a/Spigot-Server-Patches/0429-Fix-items-vanishing-through-end-portal.patch b/Spigot-Server-Patches/0429-Fix-items-vanishing-through-end-portal.patch index 412fc6030..5131902ea 100644 --- a/Spigot-Server-Patches/0429-Fix-items-vanishing-through-end-portal.patch +++ b/Spigot-Server-Patches/0429-Fix-items-vanishing-through-end-portal.patch @@ -1,4 +1,4 @@ -From f77100dc057c84378f22ee9a6f81baef5b45aff9 Mon Sep 17 00:00:00 2001 +From 7213710f407a8d44c681ea9422cd09b919499d32 Mon Sep 17 00:00:00 2001 From: AJMFactsheets Date: Wed, 22 Jan 2020 19:52:28 -0600 Subject: [PATCH] Fix items vanishing through end portal @@ -13,10 +13,10 @@ Quickly loading the exact world spawn chunk before searching the heightmap resolves the issue without having to load all spawn chunks. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index a550a81bea..0e7641a3c5 100644 +index 6509463e..a3306c6b 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -2610,6 +2610,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -2611,6 +2611,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke if (blockposition == null) { // CraftBukkit if (dimensionmanager1.getType() == DimensionManager.THE_END && dimensionmanager == DimensionManager.OVERWORLD) { // CraftBukkit @@ -29,5 +29,5 @@ index a550a81bea..0e7641a3c5 100644 EntityPortalEvent event = CraftEventFactory.callEntityPortalEvent(this, worldserver1, worldserver1.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING_NO_LEAVES, worldserver1.getSpawn()), 0); if (event == null) { -- -2.25.1 +2.26.0 diff --git a/Spigot-Server-Patches/0438-Add-option-to-nerf-pigmen-from-nether-portals.patch b/Spigot-Server-Patches/0438-Add-option-to-nerf-pigmen-from-nether-portals.patch index b9a6c9ec9..831077a39 100644 --- a/Spigot-Server-Patches/0438-Add-option-to-nerf-pigmen-from-nether-portals.patch +++ b/Spigot-Server-Patches/0438-Add-option-to-nerf-pigmen-from-nether-portals.patch @@ -1,11 +1,11 @@ -From 892ccd374ab4490d2ad82035497e602ed508bac4 Mon Sep 17 00:00:00 2001 +From 3c1c94135f8e18ad82c0a84c32a59b0f0fb41199 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 7 Feb 2020 14:36:56 -0600 Subject: [PATCH] Add option to nerf pigmen from nether portals diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index bce502181f..7d408542e7 100644 +index bce50218..7d408542 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -653,4 +653,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index bce502181f..7d408542e7 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockPortal.java b/src/main/java/net/minecraft/server/BlockPortal.java -index 2dc3ab4cfa..09c7c13183 100644 +index 2dc3ab4c..09c7c131 100644 --- a/src/main/java/net/minecraft/server/BlockPortal.java +++ b/src/main/java/net/minecraft/server/BlockPortal.java @@ -45,6 +45,8 @@ public class BlockPortal extends Block { @@ -32,7 +32,7 @@ index 2dc3ab4cfa..09c7c13183 100644 } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 0e7641a3c5..65457c89ad 100644 +index a3306c6b..16f2e32d 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -194,6 +194,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -43,7 +43,7 @@ index 0e7641a3c5..65457c89ad 100644 protected int numCollisions = 0; // Paper public void inactiveTick() { } // Spigot end -@@ -1644,6 +1645,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -1645,6 +1646,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke if (spawnedViaMobSpawner) { nbttagcompound.setBoolean("Paper.FromMobSpawner", true); } @@ -53,7 +53,7 @@ index 0e7641a3c5..65457c89ad 100644 // Paper end return nbttagcompound; } catch (Throwable throwable) { -@@ -1766,6 +1770,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -1767,6 +1771,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke } spawnedViaMobSpawner = nbttagcompound.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status @@ -62,5 +62,5 @@ index 0e7641a3c5..65457c89ad 100644 String spawnReasonName = nbttagcompound.getString("Paper.SpawnReason"); try { -- -2.25.1 +2.26.0