Updated for latest Bukkit.

EngineHub · Mar 27, 2011 · 63beba8 · 63beba8
1 parent cd54bb6
commit 63beba8
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 93 deletions.
diff --git a/src/com/sk89q/bukkit/migration/PermissionsResolverServerListener.java b/src/com/sk89q/bukkit/migration/PermissionsResolverServerListener.java
@@ -38,7 +38,7 @@ public PermissionsResolverServerListener(PermissionsResolverManager manager) {
      * @param event Relevant event details
      */
     @Override
-    public void onPluginEnabled(PluginEvent event) {
+    public void onPluginEnable(PluginEvent event) {
         Plugin plugin = event.getPlugin();
         String name = plugin.getDescription().getName();
 
@@ -56,7 +56,7 @@ public void onPluginEnabled(PluginEvent event) {
      * @param event Relevant event details
      */
     @Override
-    public void onPluginDisabled(PluginEvent event) {
+    public void onPluginDisable(PluginEvent event) {
         Plugin plugin = event.getPlugin();
         String name = plugin.getDescription().getName();
 

diff --git a/src/com/sk89q/worldedit/bukkit/BukkitPlayer.java b/src/com/sk89q/worldedit/bukkit/BukkitPlayer.java
@@ -92,7 +92,7 @@ public void printError(String msg) {
 
     @Override
     public void setPosition(Vector pos, float pitch, float yaw) {
-        player.teleportTo(new Location(player.getWorld(), pos.getX(), pos.getY(),
+        player.teleport(new Location(player.getWorld(), pos.getX(), pos.getY(),
                 pos.getZ(), yaw, pitch));
     }
 

diff --git a/src/com/sk89q/worldedit/bukkit/WorldEditBlockListener.java b/src/com/sk89q/worldedit/bukkit/WorldEditBlockListener.java
diff --git a/src/com/sk89q/worldedit/bukkit/WorldEditPlayerListener.java b/src/com/sk89q/worldedit/bukkit/WorldEditPlayerListener.java
@@ -20,13 +20,15 @@
 package com.sk89q.worldedit.bukkit;
 
 import org.bukkit.entity.Player;
+import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerAnimationEvent;
 import org.bukkit.event.player.PlayerAnimationType;
 import org.bukkit.event.player.PlayerChatEvent;
 import org.bukkit.event.player.PlayerEvent;
-import org.bukkit.event.player.PlayerItemEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerListener;
 import com.sk89q.worldedit.LocalPlayer;
+import com.sk89q.worldedit.LocalWorld;
 import com.sk89q.worldedit.WorldVector;
 import com.sk89q.worldedit.blocks.BlockID;
 
@@ -93,16 +95,40 @@ public void onPlayerCommandPreprocess(PlayerChatEvent event) {
             event.setCancelled(true);
         }
     }
-    
+
     /**
-     * Called when a player uses an item
-     * 
+     * Called when a player interacts
+     *
      * @param event Relevant event details
      */
     @Override
-    public void onPlayerItem(PlayerItemEvent event) {
-        if (plugin.controller.handleRightClick(wrapPlayer(event.getPlayer()))) {
-            event.setCancelled(true);
+    public void onPlayerInteract(PlayerInteractEvent event) {
+        if (event.getAction() == Action.LEFT_CLICK_BLOCK) {
+            LocalWorld world = new BukkitWorld(event.getClickedBlock().getWorld());
+            WorldVector pos = new WorldVector(world, event.getClickedBlock().getX(),
+                    event.getClickedBlock().getY(), event.getClickedBlock().getZ());
+            LocalPlayer player = wrapPlayer(event.getPlayer());
+
+            if (plugin.controller.handleBlockLeftClick(player, pos)) {
+                event.setCancelled(true);
+            }
+        } else if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+            LocalWorld world = new BukkitWorld(event.getClickedBlock().getWorld());
+            WorldVector pos = new WorldVector(world, event.getClickedBlock().getX(),
+                    event.getClickedBlock().getY(), event.getClickedBlock().getZ());
+            LocalPlayer player = wrapPlayer(event.getPlayer());
+
+            if (plugin.controller.handleBlockRightClick(player, pos)) {
+                event.setCancelled(true);
+            }
+
+            if (plugin.controller.handleRightClick(wrapPlayer(event.getPlayer()))) {
+                event.setCancelled(true);
+            }
+        } else if (event.getAction() == Action.RIGHT_CLICK_AIR) {
+            if (plugin.controller.handleRightClick(wrapPlayer(event.getPlayer()))) {
+                event.setCancelled(true);
+            }
         }
     }
 

diff --git a/src/com/sk89q/worldedit/bukkit/WorldEditPlugin.java b/src/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
@@ -126,14 +126,11 @@ protected void loadConfiguration() {
     protected void registerEvents() {        
         PlayerListener playerListener = new WorldEditPlayerListener(this);
         PlayerListener criticalPlayerListener = new WorldEditCriticalPlayerListener(this);
-        BlockListener blockListener = new WorldEditBlockListener(this);
 
         registerEvent(Event.Type.PLAYER_QUIT, playerListener);
         registerEvent(Event.Type.PLAYER_ANIMATION, playerListener);
-        registerEvent(Event.Type.PLAYER_ITEM, playerListener);
+        registerEvent(Event.Type.PLAYER_INTERACT, playerListener);
         registerEvent(Event.Type.PLAYER_COMMAND_PREPROCESS, playerListener);
-        registerEvent(Event.Type.BLOCK_DAMAGED, blockListener);
-        registerEvent(Event.Type.BLOCK_RIGHTCLICKED, blockListener);
         registerEvent(Event.Type.PLAYER_JOIN, criticalPlayerListener, Priority.Lowest);
 
         // The permissions resolver has some hooks of its own