diff --git a/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java b/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
index c6790bf88..2fc4cca53 100644
--- a/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
+++ b/src/main/java/net/citizensnpcs/trait/waypoint/LinearWaypointProvider.java
@@ -36,6 +36,8 @@ public class LinearWaypointProvider implements WaypointProvider {
             @EventHandler
             @SuppressWarnings("unused")
             public void onPlayerInteract(PlayerInteractEvent event) {
+                if (!event.getPlayer().equals(player))
+                    return;
                 if (event.getAction() == Action.LEFT_CLICK_BLOCK) {
                     waypoints.add(new Waypoint(event.getClickedBlock().getLocation()));
                     player.sendMessage(ChatColor.GREEN + "Added a waypoint.");
diff --git a/src/main/java/net/citizensnpcs/trait/waypoint/Waypoints.java b/src/main/java/net/citizensnpcs/trait/waypoint/Waypoints.java
index 450496386..af07f7cdb 100644
--- a/src/main/java/net/citizensnpcs/trait/waypoint/Waypoints.java
+++ b/src/main/java/net/citizensnpcs/trait/waypoint/Waypoints.java
@@ -50,4 +50,8 @@ public class Waypoints extends Trait {
     }
 
     private static final InstanceFactory<WaypointProvider> providers = DefaultInstanceFactory.create();
+
+    static {
+        providers.register(LinearWaypointProvider.class, "linear");
+    }
 }
\ No newline at end of file