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

Add a NPE check to getVehicle

Browse Source
This commit is contained in:
fullwall 2018-03-02 00:39:05 +08:00
parent d14119bc38
commit bf13181bd1
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
View File

@ -505,6 +505,9 @@ public class NMSImpl implements NMSBridge {
@Override @Override
public org.bukkit.entity.Entity getVehicle(org.bukkit.entity.Entity entity) { public org.bukkit.entity.Entity getVehicle(org.bukkit.entity.Entity entity) {
Entity handle = NMSImpl.getHandle(entity); Entity handle = NMSImpl.getHandle(entity);
if (handle == null) {
return null;
}
Entity e = handle.getVehicle(); Entity e = handle.getVehicle();
return (e == handle || e == null) ? null : e.getBukkitEntity(); return (e == handle || e == null) ? null : e.getBukkitEntity();
} }

3
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java
View File

@ -547,6 +547,9 @@ public class NMSImpl implements NMSBridge {
@Override @Override
public org.bukkit.entity.Entity getVehicle(org.bukkit.entity.Entity entity) { public org.bukkit.entity.Entity getVehicle(org.bukkit.entity.Entity entity) {
Entity handle = NMSImpl.getHandle(entity); Entity handle = NMSImpl.getHandle(entity);
if (handle == null) {
return null;
}
Entity e = handle.getVehicle(); Entity e = handle.getVehicle();
return (e == handle || e == null) ? null : e.getBukkitEntity(); return (e == handle || e == null) ? null : e.getBukkitEntity();
} }

6
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java
View File

@ -84,9 +84,10 @@ public class OcelotController extends MobEntityController {
// this method is called by both the entities involved - cancelling // this method is called by both the entities involved - cancelling
// it will not stop the NPC from moving. // it will not stop the NPC from moving.
super.collide(entity); super.collide(entity);
if (npc != null) if (npc != null) {
Util.callCollisionEvent(npc, entity.getBukkitEntity()); Util.callCollisionEvent(npc, entity.getBukkitEntity());
} }
}
@Override @Override
protected SoundEffect d(DamageSource damagesource) { protected SoundEffect d(DamageSource damagesource) {
@ -188,9 +189,10 @@ public class OcelotController extends MobEntityController {
@Override @Override
public void M() { public void M() {
super.M(); super.M();
if (npc != null) if (npc != null) {
npc.update(); npc.update();
} }
}
@Override @Override
public boolean m_() { public boolean m_() {

3
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java
View File

@ -551,6 +551,9 @@ public class NMSImpl implements NMSBridge {
@Override @Override
public org.bukkit.entity.Entity getVehicle(org.bukkit.entity.Entity entity) { public org.bukkit.entity.Entity getVehicle(org.bukkit.entity.Entity entity) {
Entity handle = NMSImpl.getHandle(entity); Entity handle = NMSImpl.getHandle(entity);
if (handle == null) {
return null;
}
Entity e = handle.getVehicle(); Entity e = handle.getVehicle();
return (e == handle || e == null) ? null : e.getBukkitEntity(); return (e == handle || e == null) ? null : e.getBukkitEntity();
} }