Updated Upstream (CraftBukkit) (#4663)

This commit is contained in:
Mariell
2020-10-17 22:42:18 +02:00
committed by GitHub
parent 8319e912f4
commit 63d6aac46a
13 changed files with 35 additions and 35 deletions

View File

@@ -117,10 +117,10 @@ index a807933d65a22dc1b15eda4dee819af72006fff3..25a4bd5a216798d01da33e54da4ab0e2
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index c4d7430cfe037ed65b49d2cc9c3d95002368fdc1..cee519adaad3f784640bb4d91b53b107054c5e58 100644
index b1804d274e95d2e51018acd1159a9dfa1573d3be..37f7ab8cb46312ce4a7fb53f3b394c1a6c478126 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1032,4 +1032,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1033,4 +1033,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return spigot;
}
// Spigot end