diff --git a/Spigot-Server-Patches/Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/Implement-PlayerLocaleChangeEvent.patch
index 42d5f20954..98e6f23502 100644
--- a/Spigot-Server-Patches/Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/Implement-PlayerLocaleChangeEvent.patch
@@ -8,7 +8,7 @@ diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/jav
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/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 {
  
      private static final Logger bR = LogManager.getLogger();
@@ -18,9 +18,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
 @@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-     }
- 
-     public void a(PacketPlayInSettings packetplayinsettings) {
+             this.server.server.getPluginManager().callEvent(event);
+         }
+         // CraftBukkit end
++
 +        // Paper start - add PlayerLocaleChangeEvent
 +        // Since the field is initialized to null, this event should always fire the first time the packet is received
 +        String oldLocale = this.locale;
@@ -48,6 +49,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          }
  
          @Override
--- 
-2.7.4 (Apple Git-66)
-
+--
\ No newline at end of file
diff --git a/work/Bukkit b/work/Bukkit
index b276e93f56..7c7228c87a 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit b276e93f56cc04aaa2011efa1fe16b839c611eb7
+Subproject commit 7c7228c87abb4e787dd466e47e3c30a7757945ea
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 042911fef4..106ced01e0 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 042911fef46a2efd1fcc4266a01ede48e6e2948c
+Subproject commit 106ced01e0bd24a20633d4f3aa99c2452736be74