Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update Upstream

Browse Source
This commit is contained in:
Spottedleaf
2019-05-05 19:58:04 -07:00
parent cb24079b77
commit eeb2ecd789
348 changed files with 1661 additions and 1710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0074-Entity-AddTo-RemoveFrom-World-Events.patch
View File

@@ -1,14 +1,14 @@
From d647d04ede2b5474f0cb91095508711bd941a00c Mon Sep 17 00:00:00 2001
From c5bd4c046c5623d852b9dc727a4b8f0cba872b3f 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 7923808ff1..0fee51ac4a 100644
index 5fe2041b9d..269f793926 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1107,6 +1107,7 @@ public class WorldServer extends World {
@@ -1108,6 +1108,7 @@ public class WorldServer extends World {
entity.origin = entity.getBukkitEntity().getLocation();
}
// Paper end
@@ -16,7 +16,7 @@ index 7923808ff1..0fee51ac4a 100644
}
}
@@ -1116,6 +1117,7 @@ public class WorldServer extends World {
@@ -1117,6 +1118,7 @@ public class WorldServer extends World {
if (this.tickingEntities) {
throw new IllegalStateException("Removing entity while ticking!");
} else {