SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.11.1

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-12-21 07:00:00 +11:00
parent 74902a47aa
commit f9a809b2ba
29 changed files with 368 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
paper-server/nms-patches/WorldServer.patch
View File

@@ -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