JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

null pointers with siege weaponl oading

Browse Source
This commit is contained in:
NewGarbo 2016-02-18 21:37:13 +00:00
parent 8507bb1bd8
commit 24b834370b
3 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/Cannon.java
View File

@ -223,6 +223,9 @@ public class Cannon extends SiegeWeapon
.filter(entity -> entity.getType().equals(EntityType.ARMOR_STAND))
.filter(entity -> entity.hasMetadata("WeaponId"))
.filter(entity -> entity.getMetadata("WeaponId").get(0).asInt() == _uniqueId)
.filter(entity -> entity.getPassenger() != null)
.filter(entity -> entity.getPassenger().getPassenger() != null)
.limit(1l)
.forEach(entity -> {
addEntity(entity, "WEAPON");
@ -230,6 +233,11 @@ public class Cannon extends SiegeWeapon
addEntity(entity.getPassenger().getPassenger(), "PLAYERMOUNT");
});
if (getEntity("WEAPON") == null || getEntity("Filler_1") == null || getEntity("PLAYERMOUNT") == null)
{
kill();
}
}
@Override

30
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/Catapult.java
View File

@ -227,17 +227,25 @@ public class Catapult extends SiegeWeapon
public void FindEntities()
{
Lists.newArrayList(_location.getChunk().getEntities())
.stream()
.filter(entity -> entity.getType().equals(EntityType.ARMOR_STAND))
.filter(entity -> entity.hasMetadata("WeaponId"))
.filter(entity -> entity.getMetadata("WeaponId").get(0).asInt() == _uniqueId)
.forEach(entity -> {
addEntity(entity, "WEAPON");
addEntity(entity.getPassenger(), "Filler_1");
addEntity(entity.getPassenger().getPassenger(), "PLAYERMOUNT");
});
.stream()
.filter(entity -> entity.getType().equals(EntityType.ARMOR_STAND))
.filter(entity -> entity.hasMetadata("WeaponId"))
.filter(entity -> entity.getMetadata("WeaponId").get(0).asInt() == _uniqueId)
.filter(entity -> entity.getPassenger() != null)
.filter(entity -> entity.getPassenger().getPassenger() != null)
.limit(1l)
.forEach(entity -> {
addEntity(entity, "WEAPON");
addEntity(entity.getPassenger(), "Filler_1");
addEntity(entity.getPassenger().getPassenger(), "PLAYERMOUNT");
});
if (getEntity("WEAPON") == null || getEntity("Filler_1") == null || getEntity("PLAYERMOUNT") == null)
{
kill();
}
}
@Override

7
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/SiegeWeapon.java
View File

@ -256,15 +256,16 @@ public abstract class SiegeWeapon implements Listener
checkInv();
}
_rider = (Player) getEntity("PLAYERMOUNT").getPassenger();
if (getEntity("PLAYERMOUNT").getPassenger() != null)
{
_rider = (Player) getEntity("PLAYERMOUNT").getPassenger();
}
if (!getNextState().equals(_currentState))
{
setState(getNextState());
}
if (_projectile != null)
{
if (_projectile.hasDied())