Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-24 11:38:26 +01:00
Code Issues Projects Releases Wiki Activity

Implement NPCPush/CollisionEvent

Browse Source
This commit is contained in:
fullwall 2012-07-28 15:02:57 +08:00
parent 585de19c25
commit 11325cbbfa
28 changed files with 327 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/net/citizensnpcs/Settings.java
View File

@ -88,15 +88,18 @@ public class Settings {
}
public double asDouble() {
return (Double) value;
return ((Number) value).doubleValue();
}
public float asFloat() {
return (Float) value;
return ((Number) value).floatValue();
}
public int asInt() {
return Integer.parseInt(value.toString());
if (value instanceof String) {
return Integer.parseInt(value.toString());
}
return ((Number) value).intValue();
}
@SuppressWarnings("unchecked")
@ -108,7 +111,7 @@ public class Settings {
}
public long asLong() {
return (Long) value;
return ((Number) value).longValue();
}
public String asString() {

16
src/main/java/net/citizensnpcs/npc/entity/CitizensBlazeNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPC;
@ -46,13 +46,21 @@ public class CitizensBlazeNPC extends CitizensMobNPC {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/CitizensCaveSpiderNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPC;
@ -42,13 +42,21 @@ public class CitizensCaveSpiderNPC extends CitizensMobNPC {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/CitizensChickenNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPC;
@ -46,13 +46,21 @@ public class CitizensChickenNPC extends CitizensMobNPC {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/CitizensCowNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPC;
@ -46,13 +46,21 @@ public class CitizensCowNPC extends CitizensMobNPC {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/CitizensCreeperNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPC;
@ -53,13 +53,21 @@ public class CitizensCreeperNPC extends CitizensMobNPC {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/CitizensEnderDragonNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPC;
@ -42,13 +42,21 @@ public class CitizensEnderDragonNPC extends CitizensMobNPC {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/CitizensEndermanNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.api.trait.trait.Equipment;
import net.citizensnpcs.editor.Equipable;
@ -84,13 +84,21 @@ public class CitizensEndermanNPC extends CitizensMobNPC implements Equipable {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/CitizensGhastNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPC;
@ -46,13 +46,21 @@ public class CitizensGhastNPC extends CitizensMobNPC {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/CitizensGiantNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPC;
@ -42,13 +42,21 @@ public class CitizensGiantNPC extends CitizensMobNPC {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/CitizensIronGolemNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPC;
@ -42,13 +42,21 @@ public class CitizensIronGolemNPC extends CitizensMobNPC {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/CitizensMagmaCubeNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPC;
@ -47,13 +47,21 @@ public class CitizensMagmaCubeNPC extends CitizensMobNPC {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/CitizensMushroomCowNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPC;
@ -46,13 +46,21 @@ public class CitizensMushroomCowNPC extends CitizensMobNPC {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/CitizensOcelotNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPC;
@ -46,13 +46,21 @@ public class CitizensOcelotNPC extends CitizensMobNPC {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/CitizensPigNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.editor.Equipable;
import net.citizensnpcs.npc.CitizensMobNPC;
@ -79,13 +79,21 @@ public class CitizensPigNPC extends CitizensMobNPC implements Equipable {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/CitizensPigZombieNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPC;
@ -46,13 +46,21 @@ public class CitizensPigZombieNPC extends CitizensMobNPC {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/CitizensSheepNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.editor.Equipable;
import net.citizensnpcs.npc.CitizensMobNPC;
@ -84,13 +84,21 @@ public class CitizensSheepNPC extends CitizensMobNPC implements Equipable {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/CitizensSilverfishNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPC;
@ -46,13 +46,21 @@ public class CitizensSilverfishNPC extends CitizensMobNPC {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/CitizensSkeletonNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPC;
@ -46,13 +46,21 @@ public class CitizensSkeletonNPC extends CitizensMobNPC {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/CitizensSlimeNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPC;
@ -47,13 +47,21 @@ public class CitizensSlimeNPC extends CitizensMobNPC {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/CitizensSnowmanNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPC;
@ -42,13 +42,21 @@ public class CitizensSnowmanNPC extends CitizensMobNPC {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/CitizensSpiderNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPC;
@ -46,13 +46,21 @@ public class CitizensSpiderNPC extends CitizensMobNPC {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/CitizensSquidNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPC;
@ -46,13 +46,21 @@ public class CitizensSquidNPC extends CitizensMobNPC {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/CitizensVillagerNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPC;
@ -46,13 +46,21 @@ public class CitizensVillagerNPC extends CitizensMobNPC {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/CitizensWolfNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPC;
@ -46,13 +46,21 @@ public class CitizensWolfNPC extends CitizensMobNPC {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/CitizensZombieNPC.java
View File

@ -1,6 +1,6 @@
package net.citizensnpcs.npc.entity;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPC;
@ -46,13 +46,21 @@ public class CitizensZombieNPC extends CitizensMobNPC {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

16
src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java
View File

@ -2,7 +2,7 @@ package net.citizensnpcs.npc.entity;
import java.io.IOException;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.npc.CitizensNPC;
import net.citizensnpcs.npc.ai.NPCHolder;
@ -52,13 +52,21 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
super.b_(x, y, z);
return;
}
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length == 0)
if (NPCPushEvent.getHandlerList().getRegisteredListeners().length == 0)
return;
NPCCollisionEvent event = Util.callCollisionEvent(npc, new Vector(x, y, z));
NPCPushEvent event = Util.callPushEvent(npc, new Vector(x, y, z));
if (!event.isCancelled())
super.b_(x, y, z);
// when another entity collides, b_ is called to push the NPC
// so we prevent b_ from doing anything.
// so we prevent b_ from doing anything if the event is cancelled.
}
@Override
public void collide(net.minecraft.server.Entity entity) {
// this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving.
super.collide(entity);
Util.callCollisionEvent(npc, entity);
}
@Override

10
src/main/java/net/citizensnpcs/util/Util.java
View File

@ -8,6 +8,7 @@ import java.util.Map;
import net.citizensnpcs.Settings.Setting;
import net.citizensnpcs.api.event.NPCCollisionEvent;
import net.citizensnpcs.api.event.NPCPushEvent;
import net.citizensnpcs.api.npc.NPC;
import net.minecraft.server.Packet;
@ -32,8 +33,13 @@ public class Util {
private static final Map<Class<?>, Class<?>> primitiveClassMap = Maps.newHashMap();
public static NPCCollisionEvent callCollisionEvent(NPC npc, Vector vector) {
NPCCollisionEvent event = new NPCCollisionEvent(npc, vector);
public static void callCollisionEvent(NPC npc, net.minecraft.server.Entity entity) {
if (NPCCollisionEvent.getHandlerList().getRegisteredListeners().length > 0)
Bukkit.getPluginManager().callEvent(new NPCCollisionEvent(npc, entity.getBukkitEntity()));
}
public static NPCPushEvent callPushEvent(NPC npc, Vector vector) {
NPCPushEvent event = new NPCPushEvent(npc, vector);
Bukkit.getPluginManager().callEvent(event);
return event;
}