Updated Upstream (Bukkit/CraftBukkit) (#7022)

This commit is contained in:
Jake Potrebic 2021-12-04 23:11:59 -08:00 committed by GitHub
parent a8e5141f2a
commit fd352861b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
69 changed files with 281 additions and 247 deletions

View file

@ -28,10 +28,10 @@ index 3a09ce6d0ea51436adcae4719d3f28d1868c283c..7bc5aa35b52de0027cf58a6127a99034
return true;
});
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 5a62770e19adb7bbd6b220e068dce26990dbc8c4..853d6b7e329240b701854256419bea0d4fc4bd67 100644
index a469ab0056c133aa40f1c9f70782d6a8c40b6dfd..f696e31ec286263c4d06d6897b3aef0fa50f8f34 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1224,8 +1224,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1225,8 +1225,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return GameMode.getByValue(this.getHandle().gameMode.getGameModeForPlayer().getId());
}