Merge pull request #372 from PseudoKnight/master

Rewrite player_move and vehicle_move to use server events. Add world prefilters.

Author: LadyCailin

src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitPlayerEvents.java

@@ -42,34 +42,10 @@
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
-import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
-import org.bukkit.event.player.AsyncPlayerChatEvent;
-import org.bukkit.event.player.PlayerBedEnterEvent;
-import org.bukkit.event.player.PlayerBedLeaveEvent;
-import org.bukkit.event.player.PlayerChangedWorldEvent;
-import org.bukkit.event.player.PlayerChatTabCompleteEvent;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerEditBookEvent;
-import org.bukkit.event.player.PlayerEvent;
-import org.bukkit.event.player.PlayerExpChangeEvent;
-import org.bukkit.event.player.PlayerFishEvent;
-import org.bukkit.event.player.PlayerGameModeChangeEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerItemConsumeEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerKickEvent;
-import org.bukkit.event.player.PlayerLoginEvent;
-import org.bukkit.event.player.PlayerPortalEvent;
-import org.bukkit.event.player.PlayerPreLoginEvent;
+import org.bukkit.event.player.*;
 import org.bukkit.event.player.PlayerPreLoginEvent.Result;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.event.player.PlayerRespawnEvent;
-import org.bukkit.event.player.PlayerTeleportEvent;
-import org.bukkit.event.player.PlayerToggleFlightEvent;
-import org.bukkit.event.player.PlayerToggleSneakEvent;
-import org.bukkit.event.player.PlayerToggleSprintEvent;
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
@@ -972,4 +948,44 @@ public void setCancelled(boolean bln) {
 			ptse.setCancelled(bln);
 		}
 	}
+
+	@abstraction(type = Implementation.Type.BUKKIT)
+	public static class BukkitMCPlayerMoveEvent extends BukkitMCPlayerEvent
+			implements MCPlayerMoveEvent {
+		PlayerMoveEvent pme;
+		int threshold;
+		MCLocation from;
+
+		public BukkitMCPlayerMoveEvent(PlayerMoveEvent event, int threshold, MCLocation from) {
+			super(event);
+			this.pme = event;
+			this.threshold = threshold;
+			this.from = from;
+		}
+
+		@Override
+		public int getThreshold() {
+			return threshold;
+		};
+
+		@Override
+		public MCLocation getFrom() {
+			return new BukkitMCLocation(from);
+		};
+
+		@Override
+		public MCLocation getTo() {
+			return new BukkitMCLocation(pme.getTo());
+		};
+
+		@Override
+		public boolean isCancelled() {
+			return pme.isCancelled();
+		}
+
+		@Override
+		public void setCancelled(boolean bln) {
+			pme.setCancelled(bln);
+		}
+	}
 }

src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitVehicleEvents.java

@@ -2,21 +2,25 @@
 
 import com.laytonsmith.abstraction.Implementation;
 import com.laytonsmith.abstraction.MCEntity;
+import com.laytonsmith.abstraction.MCLocation;
 import com.laytonsmith.abstraction.blocks.MCBlock;
 import com.laytonsmith.abstraction.bukkit.BukkitConvertor;
+import com.laytonsmith.abstraction.bukkit.BukkitMCLocation;
 import com.laytonsmith.abstraction.bukkit.blocks.BukkitMCBlock;
 import com.laytonsmith.abstraction.enums.MCCollisionType;
 import com.laytonsmith.abstraction.events.MCVehicleBlockCollideEvent;
 import com.laytonsmith.abstraction.events.MCVehicleEnitityCollideEvent;
 import com.laytonsmith.abstraction.events.MCVehicleEnterExitEvent;
 import com.laytonsmith.abstraction.events.MCVehicleEvent;
+import com.laytonsmith.abstraction.events.MCVehicleMoveEvent;
 import com.laytonsmith.annotations.abstraction;
 import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
 import org.bukkit.event.vehicle.VehicleCollisionEvent;
 import org.bukkit.event.vehicle.VehicleEnterEvent;
 import org.bukkit.event.vehicle.VehicleEntityCollisionEvent;
 import org.bukkit.event.vehicle.VehicleEvent;
 import org.bukkit.event.vehicle.VehicleExitEvent;
+import org.bukkit.event.vehicle.VehicleMoveEvent;
 
 /**
  * 
@@ -127,6 +131,49 @@ public MCEntity getEntity() {
 		}
 	}
 
+	@abstraction(type = Implementation.Type.BUKKIT)
+	public static class BukkitMCVehicleMoveEvent extends BukkitMCVehicleEvent
+			implements MCVehicleMoveEvent {
+
+		VehicleMoveEvent vme;
+		int threshold;
+		boolean cancelled;
+		MCLocation from;
+
+		public BukkitMCVehicleMoveEvent(VehicleMoveEvent event, int threshold, MCLocation from) {
+			super(event);
+			vme = event;
+			this.threshold = threshold;
+			this.cancelled = false;
+			this.from = from;
+		}
+
+		@Override
+		public int getThreshold() {
+			return threshold;
+		}
+
+		@Override
+		public MCLocation getFrom() {
+			return new BukkitMCLocation(from);
+		}
+
+		@Override
+		public MCLocation getTo() {
+			return new BukkitMCLocation(vme.getTo());
+		}
+
+		@Override
+		public void setCancelled(boolean state) {
+			cancelled = state;
+		}
+
+		@Override
+		public boolean isCancelled() {
+			return cancelled;
+		}
+	}
+
 	public static class BukkitMCVehicleEvent implements MCVehicleEvent {
 
 		VehicleEvent ve;