Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update Upstream

Browse Source 
Removed my ChunkLoadEvent patch as upstream fixed it
This commit is contained in:
Aikar
2018-07-30 01:08:59 -04:00
parent 75d71a2f14
commit 76e1e4d79f
42 changed files with 158 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0107-Implement-PlayerLocaleChangeEvent.patch
View File

@@ -1,11 +1,11 @@
From a07d8e2a3c06f3548e343ff6a5eb63d8e54766c3 Mon Sep 17 00:00:00 2001
From 131ee1008d2dfd177be70bf14d7b1741b1b2094b Mon Sep 17 00:00:00 2001
From: Isaac Moore <rmsy@me.com>
Date: Tue, 19 Apr 2016 14:09:31 -0500
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
@@ -37,7 +37,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -17,7 +17,7 @@ index 80371a836..27ea8984f 100644
public PlayerConnection playerConnection;
public final MinecraftServer server;
public final PlayerInteractManager playerInteractManager;
@@ -1228,12 +1228,19 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1241,12 +1241,19 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(getBukkitEntity(), getMainHand() == EnumMainHand.LEFT ? MainHand.LEFT : MainHand.RIGHT);
this.server.server.getPluginManager().callEvent(event);
}
@@ -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
@@ -1725,8 +1725,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {