Update upstream BD/CB/S
--- work/BuildData Submodule work/BuildData 633897ca..f0032df4: > Mappings Update --- work/CraftBukkit Submodule work/CraftBukkit b7fea427..043d31de: > SPIGOT-5015: Players in spectator mode prevent block placement and block projectiles > Make bukkitEntity private to prevent incorrect usage --- work/Spigot Submodule work/Spigot 01d0f046..baafee91: > Rebuild patches
This commit is contained in:
@@ -520,7 +520,7 @@ index 000000000..d50410532
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index e6e47bc57..202ad9489 100644
|
||||
index ec57b0ad8..1cc7b9f60 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
|
||||
@@ -528,7 +528,7 @@ index e6e47bc57..202ad9489 100644
|
||||
}
|
||||
|
||||
+ public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
|
||||
protected CraftEntity bukkitEntity;
|
||||
private CraftEntity bukkitEntity;
|
||||
|
||||
public CraftEntity getBukkitEntity() {
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
|
||||
|
||||
Reference in New Issue
Block a user