diff --git a/paper-server/patches/sources/net/minecraft/server/waypoints/ServerWaypointManager.java.patch b/paper-server/patches/sources/net/minecraft/server/waypoints/ServerWaypointManager.java.patch
new file mode 100644
index 00000000000..9b3c295fd0b
--- /dev/null
+++ b/paper-server/patches/sources/net/minecraft/server/waypoints/ServerWaypointManager.java.patch
@@ -0,0 +1,11 @@
+--- a/net/minecraft/server/waypoints/ServerWaypointManager.java
++++ b/net/minecraft/server/waypoints/ServerWaypointManager.java
+@@ -102,7 +_,7 @@
+     }
+ 
+     private static boolean isLocatorBarEnabledFor(ServerPlayer player) {
+-        return player.level().getServer().getGameRules().getBoolean(GameRules.RULE_LOCATOR_BAR);
++        return player.level().getGameRules().getBoolean(GameRules.RULE_LOCATOR_BAR); // Paper - per world gamerules
+     }
+ 
+     private void createConnection(ServerPlayer player, WaypointTransmitter waypoint) {