OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-04 14:04:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed several NPEs within World. Thanks Deaygo!

Browse source
This commit is contained in:
EvilSeph 2011-06-17 23:36:35 -04:00
parent 68695fb9d6
commit b0fcbe7fca
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/net/minecraft/server/World.java
View file

@ -1051,6 +1051,11 @@ public class World implements IBlockAccess {
for (i = 0; i < this.e.size(); ++i) { for (i = 0; i < this.e.size(); ++i) {
entity = (Entity) this.e.get(i); entity = (Entity) this.e.get(i);
// CraftBukkit start - fixed an NPE
if (entity == null) {
continue;
}
// CraftBukkit end
entity.o_(); entity.o_();
if (entity.dead) { if (entity.dead) {
this.e.remove(i--); this.e.remove(i--);
@ -1971,7 +1976,11 @@ public class World implements IBlockAccess {
Entity entity = null; Entity entity = null;
for (int i = 0; i < list.size(); ++i) { for (int i = 0; i < list.size(); ++i) {
entity = (Entity) list.get(i); entity = (Entity) list.get(i);
// CraftBukkit start - fixed an NPE
if (entity == null) {
continue;
}
// CraftBukkit end
this.entityList.add(entity); this.entityList.add(entity);
// CraftBukkit end // CraftBukkit end
this.c((Entity) list.get(i)); this.c((Entity) list.get(i));
@ -2078,6 +2087,11 @@ public class World implements IBlockAccess {
for (int i = 0; i < this.players.size(); ++i) { for (int i = 0; i < this.players.size(); ++i) {
EntityHuman entityhuman1 = (EntityHuman) this.players.get(i); EntityHuman entityhuman1 = (EntityHuman) this.players.get(i);
// CraftBukkit start - fixed an NPE
if (entityhuman1 == null) {
continue;
}
// CraftBukkit end
double d5 = entityhuman1.d(d0, d1, d2); double d5 = entityhuman1.d(d0, d1, d2);
if ((d3 < 0.0D || d5 < d3 * d3) && (d4 == -1.0D || d5 < d4)) { if ((d3 < 0.0D || d5 < d3 * d3) && (d4 == -1.0D || d5 < d4)) {