diff options
| author | md_5 <git@md-5.net> | 2016-12-21 07:00:00 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-12-21 07:00:00 +1100 |
| commit | 8ea0c87f515290c35baf0029f7b2e046c1ff49cb (patch) | |
| tree | 3ac51dcfdc206a175b73ec4013bd53c423e9b6e4 /nms-patches/WorldServer.patch | |
| parent | c8ff65136f23a3c2770b8d9ca508f61927f8acba (diff) | |
| download | craftbukkit-8ea0c87f515290c35baf0029f7b2e046c1ff49cb.tar craftbukkit-8ea0c87f515290c35baf0029f7b2e046c1ff49cb.tar.gz craftbukkit-8ea0c87f515290c35baf0029f7b2e046c1ff49cb.tar.lz craftbukkit-8ea0c87f515290c35baf0029f7b2e046c1ff49cb.tar.xz craftbukkit-8ea0c87f515290c35baf0029f7b2e046c1ff49cb.zip | |
Update to Minecraft 1.11.1
Diffstat (limited to 'nms-patches/WorldServer.patch')
| -rw-r--r-- | nms-patches/WorldServer.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nms-patches/WorldServer.patch b/nms-patches/WorldServer.patch index 37c8b6f0..386a0a48 100644 --- a/nms-patches/WorldServer.patch +++ b/nms-patches/WorldServer.patch @@ -501,12 +501,12 @@ } - public boolean addEntity(Entity entity) { -- return this.i(entity) ? super.addEntity(entity) : false; +- return this.j(entity) ? super.addEntity(entity) : false; + // CraftBukkit start + public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason + // World.addEntity(Entity) will call this, and we still want to perform + // existing entity checking when it's called with a SpawnReason -+ return this.i(entity) ? super.addEntity(entity, spawnReason) : false; ++ return this.j(entity) ? super.addEntity(entity, spawnReason) : false; } + // CraftBukkit end @@ -514,7 +514,7 @@ ArrayList arraylist = Lists.newArrayList(collection); @@ -837,7 +1062,7 @@ - private boolean i(Entity entity) { + private boolean j(Entity entity) { if (entity.dead) { - WorldServer.a.warn("Tried to add entity {} but it was marked as removed already", new Object[] { EntityTypes.a(entity)}); + // WorldServer.a.warn("Tried to add entity {} but it was marked as removed already", new Object[] { EntityTypes.a(entity)}); // CraftBukkit |