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

Update upstream CB

Browse source
This commit is contained in:
Zach Brown 2016-12-22 15:06:59 -06:00
parent d9a999639c
commit fe913c51c4
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
14 changed files with 66 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Spigot-Server-Patches/0005-Timings-v2.patch
View file

@ -1,4 +1,4 @@
From 69fff7baefbcf449770b42b9bad997db9c2d006e Mon Sep 17 00:00:00 2001
From 56fb44c71a876d56f4f1c0b1d8352586a9249086 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 04:00:11 -0600
Subject: [PATCH] Timings v2
@ -1103,7 +1103,7 @@ index 6958a2e..b3d3df4 100644
private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials();
protected World world;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index b6ae070..77ad8d6 100644
index a5b587f..e9cf737 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -18,11 +18,11 @@ import com.google.common.collect.Maps;
@ -1137,7 +1137,7 @@ index b6ae070..77ad8d6 100644
this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime);
this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
}
@@ -1382,6 +1382,7 @@ public abstract class World implements IBlockAccess {
@@ -1384,6 +1384,7 @@ public abstract class World implements IBlockAccess {
}
this.methodProfiler.c("remove");
@ -1145,7 +1145,7 @@ index b6ae070..77ad8d6 100644
this.entityList.removeAll(this.f);
int j;
@@ -1402,6 +1403,7 @@ public abstract class World implements IBlockAccess {
@@ -1404,6 +1405,7 @@ public abstract class World implements IBlockAccess {
this.f.clear();
this.l();
@ -1153,7 +1153,7 @@ index b6ae070..77ad8d6 100644
this.methodProfiler.c("regular");
CrashReportSystemDetails crashreportsystemdetails1;
@@ -1411,6 +1413,7 @@ public abstract class World implements IBlockAccess {
@@ -1413,6 +1415,7 @@ public abstract class World implements IBlockAccess {
timings.entityTick.startTiming(); // Spigot
guardEntityList = true; // Spigot
// CraftBukkit start - Use field for loop variable
@ -1161,7 +1161,7 @@ index b6ae070..77ad8d6 100644
int entitiesThisCycle = 0;
if (tickPosition < 0) tickPosition = 0;
for (entityLimiter.initTick();
@@ -1432,10 +1435,11 @@ public abstract class World implements IBlockAccess {
@@ -1434,10 +1437,11 @@ public abstract class World implements IBlockAccess {
this.methodProfiler.a("tick");
if (!entity.dead && !(entity instanceof EntityPlayer)) {
try {
@ -1175,7 +1175,7 @@ index b6ae070..77ad8d6 100644
crashreport1 = CrashReport.a(throwable1, "Ticking entity");
crashreportsystemdetails1 = crashreport1.a("Entity being ticked");
entity.appendEntityCrashDetails(crashreportsystemdetails1);
@@ -1568,6 +1572,7 @@ public abstract class World implements IBlockAccess {
@@ -1570,6 +1574,7 @@ public abstract class World implements IBlockAccess {
}
timings.tileEntityPending.stopTiming(); // Spigot
@ -1183,7 +1183,7 @@ index b6ae070..77ad8d6 100644
this.methodProfiler.b();
this.methodProfiler.b();
}
@@ -1620,7 +1625,6 @@ public abstract class World implements IBlockAccess {
@@ -1622,7 +1627,6 @@ public abstract class World implements IBlockAccess {
entity.ticksLived++;
entity.inactiveTick();
} else {
@ -1191,7 +1191,7 @@ index b6ae070..77ad8d6 100644
// CraftBukkit end
entity.M = entity.locX;
entity.N = entity.locY;
@@ -1629,6 +1633,7 @@ public abstract class World implements IBlockAccess {
@@ -1631,6 +1635,7 @@ public abstract class World implements IBlockAccess {
entity.lastPitch = entity.pitch;
if (flag && entity.aa) {
++entity.ticksLived;
@ -1199,7 +1199,7 @@ index b6ae070..77ad8d6 100644
if (entity.isPassenger()) {
entity.aw();
} else {
@@ -1687,8 +1692,6 @@ public abstract class World implements IBlockAccess {
@@ -1689,8 +1694,6 @@ public abstract class World implements IBlockAccess {
}
}
}

18
Spigot-Server-Patches/0016-Player-affects-spawning-API.patch
View file

@ -1,11 +1,11 @@
From 54e7e38b4d1b941300a7bb13bd7e66504ad09cc1 Mon Sep 17 00:00:00 2001
From 743556defa9299e57321d3c0f19e096653ca5b9c Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Tue, 1 Mar 2016 14:47:52 -0600
Subject: [PATCH] Player affects spawning API
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 82146dedb..f1823af4d 100644
index 4a5ebbd..e807160 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -63,6 +63,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -17,7 +17,7 @@ index 82146dedb..f1823af4d 100644
// CraftBukkit start
public boolean fauxSleeping;
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 21f5df3c0..a7283d36d 100644
index 21f5df3..a7283d3 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -616,7 +616,7 @@ public abstract class EntityInsentient extends EntityLiving {
@ -30,7 +30,7 @@ index 21f5df3c0..a7283d36d 100644
double d1 = entityhuman.locY - this.locY;
double d2 = entityhuman.locZ - this.locZ;
diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
index 5af51cc0a..7531c9ba9 100644
index 5af51cc..7531c9b 100644
--- a/src/main/java/net/minecraft/server/EntitySilverfish.java
+++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
@@ -99,8 +99,7 @@ public class EntitySilverfish extends EntityMonster {
@ -44,7 +44,7 @@ index 5af51cc0a..7531c9ba9 100644
return false;
}
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index 17bf3e410..a05fad54f 100644
index 17bf3e4..a05fad5 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -52,7 +52,7 @@ public final class SpawnerCreature {
@ -57,10 +57,10 @@ index 17bf3e410..a05fad54f 100644
j = MathHelper.floor(entityhuman.locZ / 16.0D);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index c5c4fad6f..64120c76c 100644
index 708de3d..a1da835 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2722,7 +2722,7 @@ public abstract class World implements IBlockAccess {
@@ -2724,7 +2724,7 @@ public abstract class World implements IBlockAccess {
for (int i = 0; i < this.players.size(); ++i) {
EntityHuman entityhuman = (EntityHuman) this.players.get(i);
@ -70,7 +70,7 @@ index c5c4fad6f..64120c76c 100644
if (d3 < 0.0D || d4 < d3 * d3) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 877a0c88d..5e9834c67 100644
index 877a0c8..5e9834c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1457,6 +1457,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -91,5 +91,5 @@ index 877a0c88d..5e9834c67 100644
private final Player.Spigot spigot = new Player.Spigot()
{
--
2.11.0.windows.1
2.9.3

8
Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch
View file

@ -1,4 +1,4 @@
From 6df7029f533e6e05f08e701e3ab6e2f4aaaaa59f Mon Sep 17 00:00:00 2001
From 883ba6ef83c0801fed8886dfe8ec9016bc929895 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 1 Mar 2016 23:52:34 -0600
Subject: [PATCH] Prevent tile entity and entity crashes
@ -23,10 +23,10 @@ index b3d3df4..d0c0371 100644
public String a() throws Exception {
int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock());
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 4544c22..8352ac1 100644
index 9d37bd9..663a930 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1447,10 +1447,12 @@ public abstract class World implements IBlockAccess {
@@ -1449,10 +1449,12 @@ public abstract class World implements IBlockAccess {
entity.tickTimer.stopTiming(); // Paper
} catch (Throwable throwable1) {
entity.tickTimer.stopTiming();
@ -43,7 +43,7 @@ index 4544c22..8352ac1 100644
}
}
@@ -1513,10 +1515,13 @@ public abstract class World implements IBlockAccess {
@@ -1515,10 +1517,13 @@ public abstract class World implements IBlockAccess {
((ITickable) tileentity).F_();
this.methodProfiler.b();
} catch (Throwable throwable2) {

8
Spigot-Server-Patches/0045-Disable-spigot-tick-limiters.patch
View file

@ -1,14 +1,14 @@
From 7a0cf132ed539cf93b18b2e6cae47ea06629d87c Mon Sep 17 00:00:00 2001
From 60edf5d11accbf57bc21f5c54e44ab1ddc4d183a Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 2 Mar 2016 23:45:17 -0600
Subject: [PATCH] Disable spigot tick limiters
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index d5f5a32..cdc573f 100644
index 953373a..362f033 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1424,10 +1424,10 @@ public abstract class World implements IBlockAccess {
@@ -1426,10 +1426,10 @@ public abstract class World implements IBlockAccess {
// CraftBukkit start - Use field for loop variable
co.aikar.timings.TimingHistory.entityTicks += this.entityList.size(); // Paper
int entitiesThisCycle = 0;
@ -23,7 +23,7 @@ index d5f5a32..cdc573f 100644
tickPosition = (tickPosition < entityList.size()) ? tickPosition : 0;
entity = (Entity) this.entityList.get(this.tickPosition);
// CraftBukkit end
@@ -1493,9 +1493,7 @@ public abstract class World implements IBlockAccess {
@@ -1495,9 +1495,7 @@ public abstract class World implements IBlockAccess {
// Spigot start
// Iterator iterator = this.tileEntityListTick.iterator();
int tilesThisCycle = 0;

8
Spigot-Server-Patches/0058-Change-implementation-of-tile-entity-removal-list.patch
View file

@ -1,11 +1,11 @@
From 49586e9ce2c202a9c911d922c357b5914814c1eb Mon Sep 17 00:00:00 2001
From 279384972ef95a7bf9e69a645d97691bca4633e0 Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 02:39:54 -0600
Subject: [PATCH] Change implementation of (tile)entity removal list
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 7f6d492..1b37b60 100644
index 50a4462..e8f5044 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -121,10 +121,10 @@ public abstract class Entity implements ICommandListener {
@ -24,7 +24,7 @@ index 7f6d492..1b37b60 100644
public boolean impulse;
public int portalCooldown;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index bfe0ee2..ad8c031 100644
index 362f033..c8dd004 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -30,6 +30,11 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@ -53,7 +53,7 @@ index bfe0ee2..ad8c031 100644
public final List<EntityHuman> players = Lists.newArrayList();
public final List<Entity> j = Lists.newArrayList();
protected final IntHashMap<Entity> entitiesById = new IntHashMap();
@@ -1395,20 +1400,20 @@ public abstract class World implements IBlockAccess {
@@ -1397,20 +1402,20 @@ public abstract class World implements IBlockAccess {
this.entityList.removeAll(this.f);
int j;

8
Spigot-Server-Patches/0062-Add-exception-reporting-event.patch
View file

@ -1,4 +1,4 @@
From 96b29581462ad920aeb31e3f2cc023f13bcdbb71 Mon Sep 17 00:00:00 2001
From 480ddad9fac506862ada43105f7830df1d9a4662 Mon Sep 17 00:00:00 2001
From: Joseph Hirschfeld <joe@ibj.io>
Date: Thu, 3 Mar 2016 03:15:41 -0600
Subject: [PATCH] Add exception reporting event
@ -292,7 +292,7 @@ index 7af5b7d..2b49802 100644
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index d762dae..62ef12f 100644
index c8dd004..c1b09f4 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1,5 +1,7 @@
@ -303,7 +303,7 @@ index d762dae..62ef12f 100644
import com.google.common.base.Function;
import com.google.common.base.Objects;
import com.google.common.base.Predicate;
@@ -1455,8 +1457,10 @@ public abstract class World implements IBlockAccess {
@@ -1457,8 +1459,10 @@ public abstract class World implements IBlockAccess {
} catch (Throwable throwable1) {
entity.tickTimer.stopTiming();
// Paper start - Prevent tile entity and entity crashes
@ -315,7 +315,7 @@ index d762dae..62ef12f 100644
entity.dead = true;
continue;
// Paper end
@@ -1521,8 +1525,10 @@ public abstract class World implements IBlockAccess {
@@ -1523,8 +1527,10 @@ public abstract class World implements IBlockAccess {
this.methodProfiler.b();
} catch (Throwable throwable2) {
// Paper start - Prevent tile entity and entity crashes

10
Spigot-Server-Patches/0090-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
View file

@ -1,4 +1,4 @@
From 18310a06e098788f1d0deebef0f80b561ac0d4dd Mon Sep 17 00:00:00 2001
From b4108fe00a0a5982b00b2fa026dae705bfe7506c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 02:07:55 -0600
Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
@ -98,7 +98,7 @@ index 3d784d0..afdc4a7 100644
private NibbleArray skyLight;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 9bb0d25..07b9626 100644
index f8b47ab..0599c6f 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -273,12 +273,12 @@ public abstract class World implements IBlockAccess {
@ -227,7 +227,7 @@ index 9bb0d25..07b9626 100644
public boolean B() {
return this.J < 4;
@@ -2017,7 +2026,7 @@ public abstract class World implements IBlockAccess {
@@ -2019,7 +2028,7 @@ public abstract class World implements IBlockAccess {
public Map<BlockPosition, TileEntity> capturedTileEntities = Maps.newHashMap();
@Nullable
public TileEntity getTileEntity(BlockPosition blockposition) {
@ -236,7 +236,7 @@ index 9bb0d25..07b9626 100644
return null;
} else {
// CraftBukkit start
@@ -2058,7 +2067,7 @@ public abstract class World implements IBlockAccess {
@@ -2060,7 +2069,7 @@ public abstract class World implements IBlockAccess {
}
public void setTileEntity(BlockPosition blockposition, @Nullable TileEntity tileentity) {
@ -245,7 +245,7 @@ index 9bb0d25..07b9626 100644
if (tileentity != null && !tileentity.y()) {
// CraftBukkit start
if (captureBlockStates) {
@@ -2121,7 +2130,7 @@ public abstract class World implements IBlockAccess {
@@ -2123,7 +2132,7 @@ public abstract class World implements IBlockAccess {
}
public boolean d(BlockPosition blockposition, boolean flag) {

8
Spigot-Server-Patches/0107-Configurable-Keep-Spawn-Loaded-range-per-world.patch
View file

@ -1,4 +1,4 @@
From ec75f3a8d8eb440fd682d09063f590595590297f Mon Sep 17 00:00:00 2001
From bf1fb7c6b2d3b4bc018e532275e87064d3a03980 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 13 Sep 2014 23:14:43 -0400
Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@ -21,7 +21,7 @@ index 615a6af..6517c32 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index fc433f9..2fc3e94 100644
index a87a9da..3809aaa 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -352,8 +352,11 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@ -39,10 +39,10 @@ index fc433f9..2fc3e94 100644
if (i1 - j > 1000L) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index abf4350..a2decad 100644
index 91be7b4..2b81c34 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -3194,8 +3194,9 @@ public abstract class World implements IBlockAccess {
@@ -3196,8 +3196,9 @@ public abstract class World implements IBlockAccess {
int k = i * 16 + 8 - blockposition.getX();
int l = j * 16 + 8 - blockposition.getZ();
boolean flag = true;

6
Spigot-Server-Patches/0109-Don-t-spam-reload-spawn-chunks-in-nether-end.patch
View file

@ -1,14 +1,14 @@
From 837b383af7193aadf5d3bb44d8901ba782831c8d Mon Sep 17 00:00:00 2001
From 625bdb997f98a53fa9bae68dcd188c5fa25c1de5 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 5 Apr 2016 19:42:22 -0400
Subject: [PATCH] Don't spam reload spawn chunks in nether/end
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 00a5a4c..eecae50 100644
index 55bd44b..22629d4 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -3190,6 +3190,7 @@ public abstract class World implements IBlockAccess {
@@ -3192,6 +3192,7 @@ public abstract class World implements IBlockAccess {
return this.N;
}

14
Spigot-Server-Patches/0113-Remove-unused-World-Tile-Entity-List.patch
View file

@ -1,4 +1,4 @@
From 0080f4b4bc4f3d05b7f37da4045656bb9f63437f Mon Sep 17 00:00:00 2001
From c9af2b2ad3768b7ed9b20a4ed4d635efcc185424 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 13 Apr 2016 00:25:28 -0400
Subject: [PATCH] Remove unused World Tile Entity List
@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List
Massive hit to performance and it is completely unnecessary.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index b988699..3747881 100644
index 22629d4..21f5580 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -68,7 +68,7 @@ public abstract class World implements IBlockAccess {
@ -18,7 +18,7 @@ index b988699..3747881 100644
public final List<TileEntity> tileEntityListTick = Lists.newArrayList();
private final List<TileEntity> b = Lists.newArrayList();
private final Set<TileEntity> tileEntityListUnload = Sets.newHashSet(); // Paper
@@ -1569,7 +1569,7 @@ public abstract class World implements IBlockAccess {
@@ -1571,7 +1571,7 @@ public abstract class World implements IBlockAccess {
// CraftBukkit start - From below, clean up tile entities before ticking them
if (!this.tileEntityListUnload.isEmpty()) {
this.tileEntityListTick.removeAll(this.tileEntityListUnload);
@ -27,7 +27,7 @@ index b988699..3747881 100644
this.tileEntityListUnload.clear();
}
// CraftBukkit end
@@ -1620,7 +1620,7 @@ public abstract class World implements IBlockAccess {
@@ -1622,7 +1622,7 @@ public abstract class World implements IBlockAccess {
if (tileentity.y()) {
tilesThisCycle--;
this.tileEntityListTick.remove(tileTickPosition--);
@ -36,7 +36,7 @@ index b988699..3747881 100644
if (this.isLoaded(tileentity.getPosition())) {
this.getChunkAtWorldCoords(tileentity.getPosition()).d(tileentity.getPosition());
}
@@ -1658,7 +1658,7 @@ public abstract class World implements IBlockAccess {
@@ -1660,7 +1660,7 @@ public abstract class World implements IBlockAccess {
this.notify(tileentity1.getPosition(), iblockdata, iblockdata, 3);
// CraftBukkit start
// From above, don't screw this up - SPIGOT-1746
@ -45,7 +45,7 @@ index b988699..3747881 100644
this.a(tileentity1);
}
// CraftBukkit end
@@ -1678,9 +1678,9 @@ public abstract class World implements IBlockAccess {
@@ -1680,9 +1680,9 @@ public abstract class World implements IBlockAccess {
protected void l() {}
public boolean a(TileEntity tileentity) {
@ -57,7 +57,7 @@ index b988699..3747881 100644
this.tileEntityListTick.add(tileentity);
}
@@ -2114,7 +2114,7 @@ public abstract class World implements IBlockAccess {
@@ -2116,7 +2116,7 @@ public abstract class World implements IBlockAccess {
} else {
if (tileentity != null) {
this.b.remove(tileentity);

6
Spigot-Server-Patches/0162-Chunk-registration-fixes.patch
View file

@ -1,4 +1,4 @@
From 3a9bc72191750a7a2283aa5cf9cd09642bc06ec5 Mon Sep 17 00:00:00 2001
From c7c0ff11a5a8282cf2f9e36494e7af37003a5020 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 21 Sep 2016 22:54:28 -0400
Subject: [PATCH] Chunk registration fixes
@ -8,10 +8,10 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr
Keep them consistent
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 1925485..2434007 100644
index 78f50ef..5c6785c 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1763,7 +1763,7 @@ public abstract class World implements IBlockAccess {
@@ -1765,7 +1765,7 @@ public abstract class World implements IBlockAccess {
}
int k = MathHelper.floor(entity.locX / 16.0D);

10
Spigot-Server-Patches/0183-Vanished-players-don-t-have-rights.patch
View file

@ -1,11 +1,11 @@
From 3c779ce69d795fa132d517881e0ba2016309696f Mon Sep 17 00:00:00 2001
From 38897d29689cc81482ced65b581cff9a73aff5a8 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Fri, 16 Dec 2016 22:10:35 -0600
Subject: [PATCH] Vanished players don't have rights
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index b278f18..1600997 100644
index 5abd80b..272974b 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -68,7 +68,7 @@ public abstract class Entity implements ICommandListener {
@ -31,10 +31,10 @@ index eb32871..a380e61 100644
IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 1dab67b..23cef2b 100644
index 2465ed7..42b5ebd 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1799,6 +1799,33 @@ public abstract class World implements IBlockAccess {
@@ -1801,6 +1801,33 @@ public abstract class World implements IBlockAccess {
return this.a(axisalignedbb, (Entity) null);
}
@ -68,7 +68,7 @@ index 1dab67b..23cef2b 100644
public boolean a(AxisAlignedBB axisalignedbb, @Nullable Entity entity) {
List list = this.getEntities((Entity) null, axisalignedbb);
@@ -2683,7 +2710,7 @@ public abstract class World implements IBlockAccess {
@@ -2685,7 +2712,7 @@ public abstract class World implements IBlockAccess {
AxisAlignedBB axisalignedbb = flag ? null : block.getBlockData().c(this, blockposition);
// CraftBukkit start - store default return

6
Spigot-Server-Patches/0190-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
View file

@ -1,4 +1,4 @@
From b5fc17d23094f1c25d9bae76e0bff778afea011e Mon Sep 17 00:00:00 2001
From e0fd50f723b617783304a59ecca77e065adea23f Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Wed, 21 Dec 2016 11:52:04 -0600
Subject: [PATCH] Option to prevent armor stands from doing entity lookups
@ -19,10 +19,10 @@ index a655b33..e8762c4 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 2911c65..6d548dd 100644
index 42b5ebd..e82bf7f 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1332,6 +1332,7 @@ public abstract class World implements IBlockAccess {
@@ -1334,6 +1334,7 @@ public abstract class World implements IBlockAccess {
this.a(entity, axisalignedbb, false, arraylist);
if (entity != null) {

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit a86731306b138fa78c130aa942bb1100cad2989f
Subproject commit e232e1519ef096a2a3e28f312f7f27f6216386a1