Skip to content
This repository was archived by the owner on Aug 31, 2019. It is now read-only.

Commit 0be062a

Browse files
rmsyrmsy
committed
Add PlayerLocaleChangeEvent
1 parent 451ac44 commit 0be062a

11 files changed

+126
-22
lines changed

‎Bukkit/0029-Add-PlayerLocaleChangeEvent.patch‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
From 229ebfcfd563a023c7a1a7b08cdfe628d759cd79 Mon Sep 17 00:00:00 2001
2+
From: Isaac Moore <[email protected]>
3+
Date: Tue, 2 Sep 2014 20:35:37 -0500
4+
Subject: [PATCH] Add PlayerLocaleChangeEvent
5+
6+
7+
diff --git a/src/main/java/org/bukkit/event/player/PlayerLocaleChangeEvent.java b/src/main/java/org/bukkit/event/player/PlayerLocaleChangeEvent.java
8+
new file mode 100644
9+
index 0000000..5e5452e
10+
--- /dev/null
11+
+++ b/src/main/java/org/bukkit/event/player/PlayerLocaleChangeEvent.java
12+
@@ -0,0 +1,46 @@
13+
+package org.bukkit.event.player;
14+
+
15+
+import org.bukkit.entity.Player;
16+
+import org.bukkit.event.HandlerList;
17+
+
18+
+/**
19+
+ * Called when the locale of the player is changed.
20+
+ */
21+
+public class PlayerLocaleChangeEvent extends PlayerEvent {
22+
+ private static final HandlerList handlers = new HandlerList();
23+
+ private final String oldLocale;
24+
+ private final String newLocale;
25+
+
26+
+ public PlayerLocaleChangeEvent(final Player player, final String oldLocale, final String newLocale) {
27+
+ super(player);
28+
+ this.oldLocale = oldLocale;
29+
+ this.newLocale = newLocale;
30+
+ }
31+
+
32+
+ /**
33+
+ * Gets the locale the player switched from.
34+
+ *
35+
+ * @return player's old locale
36+
+ */
37+
+ public String getOldLocale() {
38+
+ return oldLocale;
39+
+ }
40+
+
41+
+ /**
42+
+ * Gets the locale the player is changed to.
43+
+ *
44+
+ * @return player's new locale
45+
+ */
46+
+ public String getNewLocale() {
47+
+ return newLocale;
48+
+ }
49+
+
50+
+ @Override
51+
+ public HandlerList getHandlers() {
52+
+ return handlers;
53+
+ }
54+
+
55+
+ public static HandlerList getHandlerList() {
56+
+ return handlers;
57+
+ }
58+
+}
59+
--
60+
1.8.4.msysgit.0
61+

‎Bukkit/0029-Snapshot-protocol.patch‎ renamed to ‎Bukkit/0030-Snapshot-protocol.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 2efc57050fec1d420a0cbfca71bba0d75a7fb832 Mon Sep 17 00:00:00 2001
1+
From 9b521f1cdbc54d7104bb6fd36ce49159225acc6f Mon Sep 17 00:00:00 2001
22
From: mrapple <[email protected]>
33
Date: Mon, 1 Sep 2014 00:34:00 -0500
44
Subject: [PATCH] Snapshot protocol
@@ -71,5 +71,5 @@ index c4cd0d7..fbe28f0 100644
7171
+ // XimeBukkit end
7272
+}
7373
--
74-
1.8.5.2 (Apple Git-48)
74+
1.8.4.msysgit.0
7575

‎CraftBukkit/0077-Add-PlayerLocaleChangeEvent.patch‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
From f4b712f272face0c1ff9820782492b5cd56e0194 Mon Sep 17 00:00:00 2001
2+
From: Isaac Moore <[email protected]>
3+
Date: Tue, 2 Sep 2014 20:36:42 -0500
4+
Subject: [PATCH] Add PlayerLocaleChangeEvent
5+
6+
7+
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
8+
index b312ec9..d29ecef 100644
9+
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
10+
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
11+
@@ -999,7 +999,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
12+
}
13+
14+
public void a(PacketPlayInSettings packetplayinsettings) {
15+
+ // SportBukkit start - add PlayerLocaleChangeEvent
16+
+ String oldLocale = this.locale;
17+
this.locale = packetplayinsettings.c();
18+
+ if (!this.locale.equals(oldLocale)) {
19+
+ CraftEventFactory.callPlayerLocaleChangeEvent(this, oldLocale, this.locale);
20+
+ }
21+
+ // SportBukkit end
22+
int i = 256 >> packetplayinsettings.d();
23+
24+
if (i > 3 && i < 20) {
25+
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
26+
index 4478e08..0743c25 100644
27+
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
28+
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
29+
@@ -912,4 +912,11 @@ public class CraftEventFactory {
30+
entityHuman.world.getServer().getPluginManager().callEvent(event);
31+
return (Cancellable) event;
32+
}
33+
+
34+
+ public static PlayerLocaleChangeEvent callPlayerLocaleChangeEvent(EntityHuman who, String oldLocale, String newLocale) {
35+
+ Player player = (Player) who.getBukkitEntity();
36+
+ PlayerLocaleChangeEvent event = new PlayerLocaleChangeEvent(player, oldLocale, newLocale);
37+
+ Bukkit.getPluginManager().callEvent(event);
38+
+ return event;
39+
+ }
40+
}
41+
--
42+
1.8.4.msysgit.0
43+

‎CraftBukkit/0077-Simplify-junk-login-messages.patch‎ renamed to ‎CraftBukkit/0078-Simplify-junk-login-messages.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 25fb006af0c478a5f7e42b1beadfab44ae35d1d5 Mon Sep 17 00:00:00 2001
1+
From 83b4aab905b655686c1c48b82a441a4853df56b8 Mon Sep 17 00:00:00 2001
22
From: mrapple <[email protected]>
33
Date: Fri, 1 Aug 2014 12:51:06 -0500
44
Subject: [PATCH] Simplify junk login messages
@@ -33,5 +33,5 @@ index 0e42005..db67554 100644
3333
}
3434
}
3535
--
36-
1.8.5.2 (Apple Git-48)
36+
1.8.4.msysgit.0
3737

‎CraftBukkit/0078-Fix-skull-bedrock-breaking-bug.patch‎ renamed to ‎CraftBukkit/0079-Fix-skull-bedrock-breaking-bug.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 3453c6a02af1b3b15e029904f0fc63d047d41f16 Mon Sep 17 00:00:00 2001
1+
From 0a555fbb889265743e2de6b93274ed3784cc9d53 Mon Sep 17 00:00:00 2001
22
From: mrapple <[email protected]>
33
Date: Mon, 11 Aug 2014 10:58:32 -0500
44
Subject: [PATCH] Fix skull bedrock breaking bug
@@ -21,5 +21,5 @@ index 4a40068..0de7aef 100644
2121
int i1 = 0;
2222

2323
--
24-
1.8.5.2 (Apple Git-48)
24+
1.8.4.msysgit.0
2525

‎CraftBukkit/0079-Remove-Overmapped-and-legacy-methods.patch‎ renamed to ‎CraftBukkit/0080-Remove-Overmapped-and-legacy-methods.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 87ac491e16ce0dce92ceb4cdfd95447d4737b567 Mon Sep 17 00:00:00 2001
1+
From 693b451f842d3f312ea8c676f577fd0943c105b4 Mon Sep 17 00:00:00 2001
22
From: Jedediah Smith <[email protected]>
33
Date: Thu, 21 Aug 2014 02:21:45 -0400
44
Subject: [PATCH] Remove Overmapped and legacy methods
@@ -257,7 +257,7 @@ index 806116a..d1bfb11 100644
257257
return getHandle().aZ();
258258
}
259259
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
260-
index daf6bb42..6401fa7 100644
260+
index daf6bb4..6401fa7 100644
261261
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
262262
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
263263
@@ -58,14 +58,4 @@ public abstract class CraftMinecart extends CraftVehicle implements Minecart {
@@ -305,5 +305,5 @@ index 2f29f2f..629a191 100644
305305
- }
306306
}
307307
--
308-
1.8.5.2 (Apple Git-48)
308+
1.8.4.msysgit.0
309309

‎CraftBukkit/0080-Remove-this-shit.patch‎ renamed to ‎CraftBukkit/0081-Remove-this-shit.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From e7a53e087a672b989cd87d529e566b86b690e3e7 Mon Sep 17 00:00:00 2001
1+
From 4e87642097e4da39c86f89d0e1205a0f4d4079e4 Mon Sep 17 00:00:00 2001
22
From: mrapple <[email protected]>
33
Date: Mon, 1 Sep 2014 15:37:16 -0500
44
Subject: [PATCH] Remove this shit
@@ -18,5 +18,5 @@ index 83f2dad..6f1f0d4 100644
1818
this.n.b();
1919
return false;
2020
--
21-
1.8.5.2 (Apple Git-48)
21+
1.8.4.msysgit.0
2222

‎CraftBukkit/0081-Fix-explosions-not-moving-invulnerable-entities.patch‎ renamed to ‎CraftBukkit/0082-Fix-explosions-not-moving-invulnerable-entities.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From de99abb9a775263c9071b21211ba025d8d33f205 Mon Sep 17 00:00:00 2001
1+
From a38da3b9b971eb3471fd86987441c1a0c8f53bb5 Mon Sep 17 00:00:00 2001
22
From: Thinkofdeath <[email protected]>
33
Date: Thu, 26 Jun 2014 14:29:11 +0100
44
Subject: [PATCH] Fix explosions not moving invulnerable entities
@@ -21,5 +21,5 @@ index 56fa999..f2d7616 100644
2121
double d11 = EnchantmentProtection.a(entity, d10);
2222

2323
--
24-
1.8.5.2 (Apple Git-48)
24+
1.8.4.msysgit.0
2525

‎CraftBukkit/0082-Optimize-DataWatcher.patch‎ renamed to ‎CraftBukkit/0083-Optimize-DataWatcher.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 5e2104a0bbb3736e4873468f2b2c15548b10a0c9 Mon Sep 17 00:00:00 2001
1+
From 23780e9523d1ccd28d9a24de0a7d3e86f15ae4cc Mon Sep 17 00:00:00 2001
22
From: md_5 <[email protected]>
33
Date: Fri, 13 Dec 2013 11:45:47 +1100
44
Subject: [PATCH] Optimize DataWatcher
@@ -130,5 +130,5 @@ index 86a1977..ec4f11a 100644
130130
}
131131
}
132132
--
133-
1.8.5.2 (Apple Git-48)
133+
1.8.4.msysgit.0
134134

‎CraftBukkit/0083-Snapshot-imports.patch‎ renamed to ‎CraftBukkit/0084-Snapshot-imports.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 9fbed69e1d030823fd5dc31a27825a442b4f7401 Mon Sep 17 00:00:00 2001
1+
From 3c29a86cfab81aeb415467a2ee22c201e71902d2 Mon Sep 17 00:00:00 2001
22
From: Thinkofdeath <[email protected]>
33
Date: Mon, 1 Sep 2014 16:47:48 +1000
44
Subject: [PATCH] Snapshot imports
@@ -2764,5 +2764,5 @@ index 0000000..29f0c99
27642764
+ }
27652765
+}
27662766
--
2767-
1.8.5.2 (Apple Git-48)
2767+
1.8.4.msysgit.0
27682768

0 commit comments

Comments
 (0)