diff --git a/Spigot-Server-Patches/0117-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0117-Implement-PlayerLocaleChangeEvent.patch
index baf7704b14..deefa80a33 100644
--- a/Spigot-Server-Patches/0117-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0117-Implement-PlayerLocaleChangeEvent.patch
@@ -1,11 +1,11 @@
-From f27f5cde237dc3ea61e03600d2ad87315dc29931 Mon Sep 17 00:00:00 2001
+From 4d9e75fcdf46bd479e8c6b6884d165640394c6d4 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index ccd4cabcd..6271d28a2 100644
+index e9377ca3..15a448d7 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -31,7 +31,7 @@ import org.bukkit.inventory.MainHand;
@@ -45,20 +45,31 @@ index ccd4cabcd..6271d28a2 100644
          this.cm = packetplayinsettings.d();
          this.getDataWatcher().set(EntityPlayer.br, Byte.valueOf((byte) packetplayinsettings.e()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 17a14fdc0..b65ac0c7e 100644
+index 17a14fdc..41330c2a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1723,7 +1723,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1585,8 +1585,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+ 
+     @Override
+     public String getLocale() {
+-        return getHandle().locale;
+-
++        // Paper start - Locale change event
++        final String locale = getHandle().locale;
++        return locale != null ? locale : "en_us";
++        // Paper end
+     }
+ 
+     public void setAffectsSpawning(boolean affects) {
+@@ -1723,7 +1725,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          @Override
          public String getLocale()
          {
 -           return getHandle().locale;
-+            // Paper start - Locale change event
-+            final String locale = getHandle().locale;
-+            return locale != null ? locale : "en_us";
++            return CraftPlayer.this.getLocale(); // Paper
          }
  
          @Override
 -- 
-2.13.3.windows.1
+2.14.1