Update upstream B/CB
This commit is contained in:
parent
eb1140acce
commit
c89e4105d2
20 changed files with 28 additions and 28 deletions
|
@ -48,7 +48,7 @@ index 2842956bf..8aeded425 100644
|
|||
uniqueId = i.getId();
|
||||
// Paper end
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 21631c588..1e73a3308 100644
|
||||
index 77c50ba14..598b210ce 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -0,0 +0,0 @@
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue