Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Bukkit support.

Browse Source
This commit is contained in:
sk89q 2011-01-09 11:43:47 -08:00
parent 8e44295304
commit 8e4558a246
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/sk89q/worldedit/bukkit/BukkitPlayer.java
View File

@ -46,7 +46,7 @@ public class BukkitPlayer extends LocalPlayer {
@Override @Override
public int getItemInHand() { public int getItemInHand() {
ItemStack itemStack = player.getSelectedItem(); ItemStack itemStack = player.getItemInHand();
return itemStack != null ? itemStack.getTypeID() : 0; return itemStack != null ? itemStack.getTypeID() : 0;
} }

10
src/com/sk89q/worldedit/bukkit/WorldEditBlockListener.java
View File

@ -23,6 +23,8 @@ import org.bukkit.Player;
import org.bukkit.event.block.BlockListener; import org.bukkit.event.block.BlockListener;
import org.bukkit.event.block.BlockBrokenEvent; import org.bukkit.event.block.BlockBrokenEvent;
import org.bukkit.event.block.BlockPlacedEvent; import org.bukkit.event.block.BlockPlacedEvent;
import org.bukkit.event.block.BlockRightClickedEvent;
import com.sk89q.worldedit.*; import com.sk89q.worldedit.*;
public class WorldEditBlockListener extends BlockListener { public class WorldEditBlockListener extends BlockListener {
@ -55,19 +57,17 @@ public class WorldEditBlockListener extends BlockListener {
} }
/** /**
* Called when a player places a block * Called when a player right clicks a block
* *
* @param event Relevant event details * @param event Relevant event details
*/ */
public void onBlockPlaced(BlockPlacedEvent event) { public void onBlockRightClicked(BlockRightClickedEvent event) {
LocalWorld world = new BukkitWorld(event.getBlock().getWorld()); LocalWorld world = new BukkitWorld(event.getBlock().getWorld());
WorldVector pos = new WorldVector(world, event.getBlock().getX(), WorldVector pos = new WorldVector(world, event.getBlock().getX(),
event.getBlock().getY(), event.getBlock().getZ()); event.getBlock().getY(), event.getBlock().getZ());
LocalPlayer player = wrapPlayer(event.getPlayer()); LocalPlayer player = wrapPlayer(event.getPlayer());
if (plugin.controller.handleBlockRightClick(player, pos)) { plugin.controller.handleBlockRightClick(player, pos);
event.setCancelled(true);
}
} }
private BukkitPlayer wrapPlayer(Player player) { private BukkitPlayer wrapPlayer(Player player) {

2
src/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
View File

@ -76,7 +76,7 @@ public class WorldEditPlugin extends JavaPlugin {
playerListener, Priority.Normal, this); playerListener, Priority.Normal, this);
getServer().getPluginManager().registerEvent(Event.Type.BLOCK_DAMAGED, getServer().getPluginManager().registerEvent(Event.Type.BLOCK_DAMAGED,
blockListener, Priority.Normal, this); blockListener, Priority.Normal, this);
getServer().getPluginManager().registerEvent(Event.Type.BLOCK_PLACED, getServer().getPluginManager().registerEvent(Event.Type.BLOCK_RIGHTCLICKED,
blockListener, Priority.Normal, this); blockListener, Priority.Normal, this);
} }
} }