SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update upstreams

Browse Source
This commit is contained in:
Zach Brown
2016-05-27 21:22:18 -05:00
parent cac7bbc139
commit ff2c1ee38e
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Spigot-Server-Patches/Implement-PlayerLocaleChangeEvent.patch
View File

@@ -8,7 +8,7 @@ diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/jav
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java --- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -0,0 +0,0 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; @@ -0,0 +0,0 @@ import org.bukkit.inventory.MainHand;
public class EntityPlayer extends EntityHuman implements ICrafting { public class EntityPlayer extends EntityHuman implements ICrafting {
private static final Logger bR = LogManager.getLogger(); private static final Logger bR = LogManager.getLogger();
@@ -18,9 +18,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
public final MinecraftServer server; public final MinecraftServer server;
public final PlayerInteractManager playerInteractManager; public final PlayerInteractManager playerInteractManager;
@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.server.server.getPluginManager().callEvent(event);
} }
// CraftBukkit end
public void a(PacketPlayInSettings packetplayinsettings) { +
+ // Paper start - add PlayerLocaleChangeEvent + // Paper start - add PlayerLocaleChangeEvent
+ // Since the field is initialized to null, this event should always fire the first time the packet is received + // Since the field is initialized to null, this event should always fire the first time the packet is received
+ String oldLocale = this.locale; + String oldLocale = this.locale;
@@ -49,5 +50,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@Override @Override
-- --
2.7.4 (Apple Git-66)

2
work/Bukkit

Submodule work/Bukkit updated: b276e93f56...7c7228c87a

2
work/CraftBukkit

Submodule work/CraftBukkit updated: 042911fef4...106ced01e0