Merge pull request #269 from Gabscap/fix-entity-tracker

Add null-check to "Entity Tracking Improvement"
This commit is contained in:
Zach Brown 2016-05-06 09:47:21 -05:00
commit d8d75b106c

View File

@ -77,7 +77,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
+ private void updatePassengers(EntityPlayer player) { + private void updatePassengers(EntityPlayer player) {
+ if (tracker.isVehicle()) { + if (tracker.isVehicle()) {
+ tracker.passengers.forEach((e) -> e.tracker.updatePlayer(player)); + tracker.passengers.forEach((e) -> {
+ if (e.tracker != null) {
+ e.tracker.updatePlayer(player);
+ }
+ });
+ player.playerConnection.sendPacket(new PacketPlayOutMount(this.tracker)); + player.playerConnection.sendPacket(new PacketPlayOutMount(this.tracker));
+ } + }
+ } + }