Skip to content

Commit

Permalink
Don't fire player events with NPCs
Browse files Browse the repository at this point in the history 
This should probably be revised somehow eventually
  • Loading branch information
@Morphan1
Morphan1 committed Feb 27, 2015
1 parent 9d565ff commit ea4e01f
Show file tree
Hide file tree
Showing 2 changed files with 113 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/main/java/net/aufdemrand/denizen/events/scriptevents/EntityTeleportScriptEvent.java
View file
Expand Up @@ -156,6 +156,10 @@ public void onEntityTeleports(EntityTeleportEvent event) {

@EventHandler
public void onPlayerTeleports(PlayerTeleportEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

from = new dLocation(event.getFrom());
to = new dLocation(event.getTo());
entity = new dEntity(event.getPlayer());
Expand Down
109 changes: 109 additions & 0 deletions src/main/java/net/aufdemrand/denizen/scripts/containers/core/BukkitWorldScriptHelper.java
View file
Expand Up @@ -96,6 +96,9 @@ public static String doEvents(List<String> events, dNPC npc, dPlayer player, Map
@EventHandler
public void blockBreak(BlockBreakEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
Block block = event.getBlock();
dMaterial material = dMaterial.getMaterialFrom(event.getBlock().getType(), event.getBlock().getData());
Expand Down Expand Up @@ -272,6 +275,9 @@ public void blockCanBuild(BlockCanBuildEvent event) {
@EventHandler
public void blockDamage(BlockDamageEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
dMaterial material = dMaterial.getMaterialFrom(event.getBlock().getType(), event.getBlock().getData());
List<String> events = new ArrayList<String>();
Expand Down Expand Up @@ -604,6 +610,9 @@ public void blockPistonRetract(BlockPistonRetractEvent event) {
@EventHandler
public void blockPlace(BlockPlaceEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
Block block = event.getBlock();
dMaterial material = dMaterial.getMaterialFrom(block.getType(), block.getData());
Expand Down Expand Up @@ -802,6 +811,9 @@ else if (Argument.valueOf(determination)
@EventHandler
public void furnaceExtract(FurnaceExtractEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
dMaterial itemMaterial = dMaterial.getMaterialFrom(event.getItemType());
dItem item = new dItem(itemMaterial, event.getItemAmount());
Expand Down Expand Up @@ -917,6 +929,9 @@ public void leavesDecay(LeavesDecayEvent event) {
@EventHandler
public void signChange(final SignChangeEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Block block = event.getBlock();
if (block == null || !(block.getState() instanceof Sign)) {
return; // Fix error induced by dark magic.
Expand Down Expand Up @@ -1173,6 +1188,9 @@ public void hangingBreak(HangingBreakEvent event) {
@EventHandler
public void hangingPlace(HangingPlaceEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
dEntity hanging = new dEntity(event.getEntity());

Expand Down Expand Up @@ -1597,6 +1615,9 @@ public void playerPortalEnter(PlayerPortalEvent event) {
return;
}

if (dEntity.isNPC(event.getPlayer()))
return;

dPlayer player = dEntity.getPlayerFrom(event.getPlayer());

Map<String, dObject> context = new HashMap<String, dObject>();
Expand Down Expand Up @@ -2631,6 +2652,9 @@ public void run() {
@EventHandler
public void inventoryCloseEvent(InventoryCloseEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();

dEntity entity = new dEntity(event.getPlayer());
Expand Down Expand Up @@ -2745,6 +2769,9 @@ public void run() {
@EventHandler
public void inventoryOpenEvent(InventoryOpenEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();

String type = event.getInventory().getType().name();
Expand Down Expand Up @@ -2845,6 +2872,10 @@ public void run() {
// -->
@EventHandler
public void playerEditBook(PlayerEditBookEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
if (event.isSigning()) context.put("title", new Element(event.getNewBookMeta().getTitle()));
context.put("pages", new Element(event.getNewBookMeta().getPageCount()));
Expand Down Expand Up @@ -2894,6 +2925,9 @@ else if (dScript.matches(determination)) {
@EventHandler
public void playerBreakItem(PlayerItemBreakEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
final ItemStack itemstack = event.getBrokenItem();
dItem item = new dItem(itemstack);
Expand Down Expand Up @@ -2938,6 +2972,9 @@ public void run() {
@EventHandler
public void playerAnimation(PlayerAnimationEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
String animation = event.getAnimationType().name();
context.put("animation", new Element(animation));
Expand Down Expand Up @@ -2966,6 +3003,9 @@ public void playerAnimation(PlayerAnimationEvent event) {
@EventHandler
public void playerBedEnter(PlayerBedEnterEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
context.put("location", new dLocation(event.getBed().getLocation()));

Expand All @@ -2989,6 +3029,9 @@ public void playerBedEnter(PlayerBedEnterEvent event) {
@EventHandler
public void playerBedLeave(PlayerBedLeaveEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
context.put("location", new dLocation(event.getBed().getLocation()));

Expand All @@ -3013,6 +3056,9 @@ public void playerBedLeave(PlayerBedLeaveEvent event) {
@EventHandler
public void playerChangedWorld(PlayerChangedWorldEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
dWorld originWorld = new dWorld(event.getFrom());
dWorld destinationWorld = new dWorld(event.getPlayer().getWorld());
Expand Down Expand Up @@ -3046,6 +3092,9 @@ public void playerChangedWorld(PlayerChangedWorldEvent event) {
@EventHandler
public void playerDropItem(PlayerDropItemEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
dItem item = new dItem(event.getItemDrop().getItemStack());
context.put("item", item);
Expand Down Expand Up @@ -3080,6 +3129,9 @@ public void playerDropItem(PlayerDropItemEvent event) {
@EventHandler
public void playerEggThrow(PlayerEggThrowEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
dEntity egg = new dEntity(event.getEgg());
context.put("egg", egg);
Expand Down Expand Up @@ -3118,6 +3170,9 @@ else if (dEntity.matches(determination)) {
@EventHandler
public void playerExpChange(PlayerExpChangeEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
context.put("amount", new Element(event.getAmount()));

Expand Down Expand Up @@ -3151,6 +3206,9 @@ else if (Argument.valueOf(determination).matchesPrimitive(aH.PrimitiveType.Integ
@EventHandler
public void playerFish(PlayerFishEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

dNPC npc = null;
String state = event.getState().name();

Expand Down Expand Up @@ -3199,6 +3257,9 @@ public void playerFish(PlayerFishEvent event) {
@EventHandler
public void playerGameModeChange(PlayerGameModeChangeEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
context.put("gamemode", new Element(event.getNewGameMode().name()));

Expand Down Expand Up @@ -3235,6 +3296,9 @@ public void playerGameModeChange(PlayerGameModeChangeEvent event) {
@EventHandler
public void playerInteract(PlayerInteractEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
Action action = event.getAction();
dItem item = null;
Expand Down Expand Up @@ -3351,6 +3415,9 @@ else if (determination.startsWith("CANCELLED"))
@EventHandler
public void playerInteractStand(PlayerInteractAtEntityEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
context.put("location", new dLocation(event.getPlayer().getWorld(),
event.getClickedPosition().getX(),
Expand Down Expand Up @@ -3419,6 +3486,9 @@ public void playerInteractStand(PlayerInteractAtEntityEvent event) {
@EventHandler
public void playerInteractEntity(PlayerInteractEntityEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

String determination;
dNPC npc = null;

Expand Down Expand Up @@ -3494,6 +3564,9 @@ public void playerInteractEntity(PlayerInteractEntityEvent event) {
@EventHandler
public void playerItemConsume(PlayerItemConsumeEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

dItem item = new dItem(event.getItem());

Map<String, dObject> context = new HashMap<String, dObject>();
Expand Down Expand Up @@ -3532,6 +3605,9 @@ else if (dItem.matches(determination)) {
@EventHandler
public void playerJoinEvent(PlayerJoinEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Player player = event.getPlayer();
Map<String, dObject> context = new HashMap<String, dObject>();
context.put("message", new Element(event.getJoinMessage()));
Expand Down Expand Up @@ -3570,6 +3646,9 @@ public void playerJoinEvent(PlayerJoinEvent event) {
@EventHandler
public void playerKick(PlayerKickEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
context.put("message", new Element(event.getLeaveMessage()));

Expand Down Expand Up @@ -3599,6 +3678,9 @@ public void playerKick(PlayerKickEvent event) {
@EventHandler
public void playerLeashEntity(PlayerLeashEntityEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
dEntity entity = new dEntity(event.getEntity());

Expand Down Expand Up @@ -3626,6 +3708,9 @@ public void playerLeashEntity(PlayerLeashEntityEvent event) {
@EventHandler
public void playerLevelChange(PlayerLevelChangeEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
context.put("level", new Element(event.getNewLevel()));

Expand Down Expand Up @@ -3653,6 +3738,9 @@ public void playerLevelChange(PlayerLevelChangeEvent event) {
@EventHandler
public void playerLogin(PlayerLoginEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
List<String> events = new ArrayList<String>();
context.put("hostname", new Element(event.getHostname()));
Expand Down Expand Up @@ -3729,6 +3817,9 @@ public void playerMove(PlayerMoveEvent event) {
@EventHandler
public void playerPickupItem(PlayerPickupItemEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
dItem item = new dItem(event.getItem().getItemStack());
context.put("item", item);
Expand Down Expand Up @@ -3766,6 +3857,9 @@ public void playerPickupItem(PlayerPickupItemEvent event) {
@EventHandler
public void playerQuit(PlayerQuitEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
context.put("message", new Element(event.getQuitMessage()));

Expand Down Expand Up @@ -3794,6 +3888,9 @@ public void playerQuit(PlayerQuitEvent event) {
@EventHandler
public void playerRespawn(PlayerRespawnEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
context.put("location", new dLocation(event.getRespawnLocation()));

Expand Down Expand Up @@ -3829,6 +3926,9 @@ public void playerRespawn(PlayerRespawnEvent event) {
@EventHandler
public void playerShearEntity(PlayerShearEntityEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
dEntity entity = new dEntity(event.getEntity());

Expand Down Expand Up @@ -3866,6 +3966,9 @@ public void playerShearEntity(PlayerShearEntityEvent event) {
@EventHandler
public void playerToggleFlight(PlayerToggleFlightEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
context.put("state", new Element(event.isFlying()));

Expand Down Expand Up @@ -3895,6 +3998,9 @@ public void playerToggleFlight(PlayerToggleFlightEvent event) {
@EventHandler
public void playerToggleSneak(PlayerToggleSneakEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
context.put("state", new Element(event.isSneaking()));

Expand Down Expand Up @@ -3924,6 +4030,9 @@ public void playerToggleSneak(PlayerToggleSneakEvent event) {
@EventHandler
public void playerToggleSprint(PlayerToggleSprintEvent event) {

if (dEntity.isNPC(event.getPlayer()))
return;

Map<String, dObject> context = new HashMap<String, dObject>();
context.put("state", new Element(event.isSprinting()));

Expand Down

0 comments on commit ea4e01f

Please sign in to comment.