From c9979cb9f544e4c713fcc14c9401857ef4598df4 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 20 Jan 2020 16:04:39 +0000 Subject: [PATCH] [CI-SKIP] Rebuild patches --- Spigot-Server-Patches/Activation-Range-Improvements.patch | 6 +++--- Spigot-Server-Patches/Fix-items-not-falling-correctly.patch | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Spigot-Server-Patches/Activation-Range-Improvements.patch b/Spigot-Server-Patches/Activation-Range-Improvements.patch index 8a8d3881fd..94e370a549 100644 --- a/Spigot-Server-Patches/Activation-Range-Improvements.patch +++ b/Spigot-Server-Patches/Activation-Range-Improvements.patch @@ -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 f0d1a5b14..c993a5522 100644 +index 77d7e6885..9143f5ee8 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -34,7 +34,7 @@ index b40c8d2f8..4eda13075 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 6bad1687f..fb395bbb5 100644 +index 5fb3c948d..e0355d3a3 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -0,0 +0,0 @@ public abstract class EntityInsentient extends EntityLiving { @@ -164,7 +164,7 @@ index 44bb18c59..f8944f860 100644 this.d.stream().filter((pathfindergoalwrapped) -> { return pathfindergoalwrapped.j() == pathfindergoal; diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index f86404f83..bd7d44f1d 100644 +index 92601c581..6e165a164 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -0,0 +0,0 @@ import net.minecraft.server.MathHelper; diff --git a/Spigot-Server-Patches/Fix-items-not-falling-correctly.patch b/Spigot-Server-Patches/Fix-items-not-falling-correctly.patch index cf5393391e..94d196fd46 100644 --- a/Spigot-Server-Patches/Fix-items-not-falling-correctly.patch +++ b/Spigot-Server-Patches/Fix-items-not-falling-correctly.patch @@ -3,7 +3,7 @@ From: AJMFactsheets Date: Fri, 17 Jan 2020 17:17:54 -0600 Subject: [PATCH] Fix items not falling correctly -Since 1.14, Mojang has added an optimization which skips checking if +Since 1.14, Mojang has added an optimization which skips checking if an item should fall every fourth tick. However, Spigot's entity activation range class also has an @@ -15,7 +15,7 @@ This patch resolves the conflict by offsetting checking an item's move method from Spigot's entity activation range check. diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index e61af3f5..30a7843b 100644 +index e61af3f5e..d15a9fcfb 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -0,0 +0,0 @@ public class EntityItem extends Entity {