mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-07 12:28:13 +02:00
f243a4024d
Removes PlayerMicroMoveEvent API, the ability to disable the AsyncCatcher, and the TeleportPassengerVehicleWithPlayer patch
46 lines
2.0 KiB
Diff
46 lines
2.0 KiB
Diff
From 42ec7f44c7264b24671c8903f2e95230911ff01d Mon Sep 17 00:00:00 2001
|
|
From: Isaac Moore <rmsy@me.com>
|
|
Date: Mon, 27 Apr 2015 21:41:39 -0500
|
|
Subject: [PATCH] Add PlayerLocaleChangeEvent
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
index 3810f86..be50b55 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
@@ -995,7 +995,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
}
|
|
|
|
public void a(PacketPlayInSettings packetplayinsettings) {
|
|
+ // PaperSpigot start - Add PlayerLocaleChangeEvent
|
|
+ String oldLocale = this.locale;
|
|
this.locale = packetplayinsettings.a();
|
|
+ if (!this.locale.equals(oldLocale)) {
|
|
+ CraftEventFactory.callPlayerLocaleChangeEvent(this, oldLocale, this.locale);
|
|
+ }
|
|
+ // PaperSpigot end
|
|
this.bR = packetplayinsettings.c();
|
|
this.bS = packetplayinsettings.d();
|
|
this.getDataWatcher().watch(10, Byte.valueOf((byte) packetplayinsettings.e()));
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
index d1bd480..2dd8508 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
@@ -963,4 +963,13 @@ public class CraftEventFactory {
|
|
entityHuman.world.getServer().getPluginManager().callEvent(event);
|
|
return (Cancellable) event;
|
|
}
|
|
+
|
|
+ // PaperSpigot start - Add PlayerLocaleChangeEvent
|
|
+ public static PlayerLocaleChangeEvent callPlayerLocaleChangeEvent(EntityHuman who, String oldLocale, String newLocale) {
|
|
+ Player player = (Player) who.getBukkitEntity();
|
|
+ PlayerLocaleChangeEvent event = new PlayerLocaleChangeEvent(player, oldLocale, newLocale);
|
|
+ Bukkit.getPluginManager().callEvent(event);
|
|
+ return event;
|
|
+ }
|
|
+ // PaperSpigot end
|
|
}
|
|
--
|
|
2.5.1
|
|
|