OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-30 16:19:03 +01:00
Code Issues Projects Releases Packages 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
Show stats Download patch file Download diff file Expand all files Collapse all files

13
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);
}
public void a(PacketPlayInSettings packetplayinsettings) { // CraftBukkit end
+
+ // 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;
@ -48,6 +49,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
@Override @Override
-- --
2.7.4 (Apple Git-66)

2
work/Bukkit

@ -1 +1 @@
Subproject commit b276e93f56cc04aaa2011efa1fe16b839c611eb7 Subproject commit 7c7228c87abb4e787dd466e47e3c30a7757945ea

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 042911fef46a2efd1fcc4266a01ede48e6e2948c Subproject commit 106ced01e0bd24a20633d4f3aa99c2452736be74