Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-05 00:20:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made events respect isCancelled()

Browse Source
This commit is contained in:
zml2008 2011-08-16 18:39:07 -07:00
parent 4d6bb6d746
commit a313f2e93e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlayerListener.java
View File

@ -70,6 +70,9 @@ public class WorldEditPlayerListener extends PlayerListener {
*/
@Override
public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
if (event.isCancelled())
return;
String[] split = event.getMessage().split(" ");
if (plugin.getWorldEdit().handleCommand(wrapPlayer(event.getPlayer()), split)) {
@ -84,14 +87,16 @@ public class WorldEditPlayerListener extends PlayerListener {
*/
@Override
public void onPlayerInteract(PlayerInteractEvent event) {
if (event.isCancelled())
return;
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.getWorldEdit().handleBlockLeftClick(player, pos)) {
event.setCancelled(true);
event.setCancelled(true);
}
if (plugin.getWorldEdit().handleArmSwing(wrapPlayer(event.getPlayer()))) {