Update Upstream

Removed my ChunkLoadEvent patch as upstream fixed it
This commit is contained in:
Aikar
2018-07-30 01:08:59 -04:00
parent 5fe01c2659
commit 720dabd2aa
40 changed files with 60 additions and 129 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerLocaleChangeEvent
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 80371a836..27ea8984f 100644
index 0b1c5ca475..e036716970 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -39,7 +39,7 @@ index 80371a836..27ea8984f 100644
this.cu = packetplayinsettings.e();
this.getDataWatcher().set(EntityPlayer.bx, Byte.valueOf((byte) packetplayinsettings.f()));
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index a84f1a055..6f23ef5b8 100644
index a84f1a055c..6f23ef5b81 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 @@ public class CraftPlayer extends CraftHumanEntity implements Player {