Update to 1.14.4 (#2333)

This commit is contained in:
Spottedleaf
2019-07-19 21:01:24 -07:00
committed by Zach
parent a41d51f098
commit 9fe63a1673
328 changed files with 1938 additions and 1954 deletions

View File

@@ -1,14 +1,14 @@
From 41fc6241ac74a486d2515d43f542b4d0c04c192d Mon Sep 17 00:00:00 2001
From 8840587b8d1c787f21915ab058e88d720e56403c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 20:32:58 -0400
Subject: [PATCH] Entity AddTo/RemoveFrom World Events
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 443986ef3a..28a6a62dfc 100644
index 44ababac7a..d2e6bd8c39 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1110,6 +1110,7 @@ public class WorldServer extends World {
@@ -1107,6 +1107,7 @@ public class WorldServer extends World {
entity.origin = entity.getBukkitEntity().getLocation();
}
// Paper end
@@ -16,7 +16,7 @@ index 443986ef3a..28a6a62dfc 100644
}
}
@@ -1119,6 +1120,7 @@ public class WorldServer extends World {
@@ -1116,6 +1117,7 @@ public class WorldServer extends World {
if (this.tickingEntities) {
throw new IllegalStateException("Removing entity while ticking!");
} else {