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 
Closes GH-556
This commit is contained in:
Zach Brown 2016-12-27 18:46:41 -06:00
parent f63a055b8b
commit 1870320545
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
14 changed files with 62 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 56fb44c71a876d56f4f1c0b1d8352586a9249086 Mon Sep 17 00:00:00 2001
From e60c0b82ac056c2191c4d5d81b94078b7b52d42f 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
@ -969,7 +969,7 @@ index a5a096b..c546139 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index ec5d6ea..3330513 100644
index 01f8343..a10d8a7 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
@ -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 a5b587f..e9cf737 100644
index 09ca809..47e3b4d 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 a5b587f..e9cf737 100644
this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime);
this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
}
@@ -1384,6 +1384,7 @@ public abstract class World implements IBlockAccess {
@@ -1379,6 +1379,7 @@ public abstract class World implements IBlockAccess {
}
this.methodProfiler.c("remove");
@ -1145,7 +1145,7 @@ index a5b587f..e9cf737 100644
this.entityList.removeAll(this.f);
int j;
@@ -1404,6 +1405,7 @@ public abstract class World implements IBlockAccess {
@@ -1399,6 +1400,7 @@ public abstract class World implements IBlockAccess {
this.f.clear();
this.l();
@ -1153,7 +1153,7 @@ index a5b587f..e9cf737 100644
this.methodProfiler.c("regular");
CrashReportSystemDetails crashreportsystemdetails1;
@@ -1413,6 +1415,7 @@ public abstract class World implements IBlockAccess {
@@ -1408,6 +1410,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 a5b587f..e9cf737 100644
int entitiesThisCycle = 0;
if (tickPosition < 0) tickPosition = 0;
for (entityLimiter.initTick();
@@ -1434,10 +1437,11 @@ public abstract class World implements IBlockAccess {
@@ -1429,10 +1432,11 @@ public abstract class World implements IBlockAccess {
this.methodProfiler.a("tick");
if (!entity.dead && !(entity instanceof EntityPlayer)) {
try {
@ -1175,7 +1175,7 @@ index a5b587f..e9cf737 100644
crashreport1 = CrashReport.a(throwable1, "Ticking entity");
crashreportsystemdetails1 = crashreport1.a("Entity being ticked");
entity.appendEntityCrashDetails(crashreportsystemdetails1);
@@ -1570,6 +1574,7 @@ public abstract class World implements IBlockAccess {
@@ -1565,6 +1569,7 @@ public abstract class World implements IBlockAccess {
}
timings.tileEntityPending.stopTiming(); // Spigot
@ -1183,7 +1183,7 @@ index a5b587f..e9cf737 100644
this.methodProfiler.b();
this.methodProfiler.b();
}
@@ -1622,7 +1627,6 @@ public abstract class World implements IBlockAccess {
@@ -1617,7 +1622,6 @@ public abstract class World implements IBlockAccess {
entity.ticksLived++;
entity.inactiveTick();
} else {
@ -1191,7 +1191,7 @@ index a5b587f..e9cf737 100644
// CraftBukkit end
entity.M = entity.locX;
entity.N = entity.locY;
@@ -1631,6 +1635,7 @@ public abstract class World implements IBlockAccess {
@@ -1626,6 +1630,7 @@ public abstract class World implements IBlockAccess {
entity.lastPitch = entity.pitch;
if (flag && entity.aa) {
++entity.ticksLived;
@ -1199,7 +1199,7 @@ index a5b587f..e9cf737 100644
if (entity.isPassenger()) {
entity.aw();
} else {
@@ -1689,8 +1694,6 @@ public abstract class World implements IBlockAccess {
@@ -1684,8 +1689,6 @@ public abstract class World implements IBlockAccess {
}
}
}

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

@ -1,11 +1,11 @@
From 743556defa9299e57321d3c0f19e096653ca5b9c Mon Sep 17 00:00:00 2001
From 2541e7a0b8cc0b9af75632151f1b327f6288e18e 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 4a5ebbd..e807160 100644
index ec8f581..43e28d6 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 {
@ -57,10 +57,10 @@ index 17bf3e4..a05fad5 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 708de3d..a1da835 100644
index b9b13c7..688f405 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2724,7 +2724,7 @@ public abstract class World implements IBlockAccess {
@@ -2719,7 +2719,7 @@ public abstract class World implements IBlockAccess {
for (int i = 0; i < this.players.size(); ++i) {
EntityHuman entityhuman = (EntityHuman) this.players.get(i);

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

@ -1,4 +1,4 @@
From 883ba6ef83c0801fed8886dfe8ec9016bc929895 Mon Sep 17 00:00:00 2001
From d36a29dd1d783b4872ed28d76ed7d840262a0524 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 9d37bd9..663a930 100644
index ca641ab..1143b3e 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1449,10 +1449,12 @@ public abstract class World implements IBlockAccess {
@@ -1444,10 +1444,12 @@ public abstract class World implements IBlockAccess {
entity.tickTimer.stopTiming(); // Paper
} catch (Throwable throwable1) {
entity.tickTimer.stopTiming();
@ -43,7 +43,7 @@ index 9d37bd9..663a930 100644
}
}
@@ -1515,10 +1517,13 @@ public abstract class World implements IBlockAccess {
@@ -1510,10 +1512,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 60edf5d11accbf57bc21f5c54e44ab1ddc4d183a Mon Sep 17 00:00:00 2001
From 90b57bb256a8c8a8f5287583fc2856d60d2deae5 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 953373a..362f033 100644
index 796f6c6..b4dacbe 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1426,10 +1426,10 @@ public abstract class World implements IBlockAccess {
@@ -1421,10 +1421,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 953373a..362f033 100644
tickPosition = (tickPosition < entityList.size()) ? tickPosition : 0;
entity = (Entity) this.entityList.get(this.tickPosition);
// CraftBukkit end
@@ -1495,9 +1495,7 @@ public abstract class World implements IBlockAccess {
@@ -1490,9 +1490,7 @@ public abstract class World implements IBlockAccess {
// Spigot start
// Iterator iterator = this.tileEntityListTick.iterator();
int tilesThisCycle = 0;

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

@ -1,4 +1,4 @@
From 279384972ef95a7bf9e69a645d97691bca4633e0 Mon Sep 17 00:00:00 2001
From 37786a98d29978e37f255293e26b5018041495f4 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
@ -24,7 +24,7 @@ index 50a4462..e8f5044 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 362f033..c8dd004 100644
index b4dacbe..857b423 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 362f033..c8dd004 100644
public final List<EntityHuman> players = Lists.newArrayList();
public final List<Entity> j = Lists.newArrayList();
protected final IntHashMap<Entity> entitiesById = new IntHashMap();
@@ -1397,20 +1402,20 @@ public abstract class World implements IBlockAccess {
@@ -1392,20 +1397,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 480ddad9fac506862ada43105f7830df1d9a4662 Mon Sep 17 00:00:00 2001
From 8e50cd23191f03f84cf5511322d9f898c3c095e7 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 c8dd004..c1b09f4 100644
index 857b423..a35741a 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 c8dd004..c1b09f4 100644
import com.google.common.base.Function;
import com.google.common.base.Objects;
import com.google.common.base.Predicate;
@@ -1457,8 +1459,10 @@ public abstract class World implements IBlockAccess {
@@ -1452,8 +1454,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 c8dd004..c1b09f4 100644
entity.dead = true;
continue;
// Paper end
@@ -1523,8 +1527,10 @@ public abstract class World implements IBlockAccess {
@@ -1518,8 +1522,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 b4108fe00a0a5982b00b2fa026dae705bfe7506c Mon Sep 17 00:00:00 2001
From 5514efc07ac11a3023ec54ec4ef3cbe58b812f74 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 f8b47ab..0599c6f 100644
index c5b5c84..c1d1414 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 f8b47ab..0599c6f 100644
public boolean B() {
return this.J < 4;
@@ -2019,7 +2028,7 @@ public abstract class World implements IBlockAccess {
@@ -2014,7 +2023,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 f8b47ab..0599c6f 100644
return null;
} else {
// CraftBukkit start
@@ -2060,7 +2069,7 @@ public abstract class World implements IBlockAccess {
@@ -2055,7 +2064,7 @@ public abstract class World implements IBlockAccess {
}
public void setTileEntity(BlockPosition blockposition, @Nullable TileEntity tileentity) {
@ -245,7 +245,7 @@ index f8b47ab..0599c6f 100644
if (tileentity != null && !tileentity.y()) {
// CraftBukkit start
if (captureBlockStates) {
@@ -2123,7 +2132,7 @@ public abstract class World implements IBlockAccess {
@@ -2118,7 +2127,7 @@ public abstract class World implements IBlockAccess {
}
public boolean d(BlockPosition blockposition, boolean flag) {

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

@ -1,4 +1,4 @@
From bf1fb7c6b2d3b4bc018e532275e87064d3a03980 Mon Sep 17 00:00:00 2001
From 41cc62d3657a36b4cdb7316506531d78d6db17a5 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
@ -39,10 +39,10 @@ index a87a9da..3809aaa 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 91be7b4..2b81c34 100644
index 2d5f3d2..9c36471 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -3196,8 +3196,9 @@ public abstract class World implements IBlockAccess {
@@ -3191,8 +3191,9 @@ public abstract class World implements IBlockAccess {
int k = i * 16 + 8 - blockposition.getX();
int l = j * 16 + 8 - blockposition.getZ();
boolean flag = true;
@ -54,7 +54,7 @@ index 91be7b4..2b81c34 100644
public void a(Packet<?> packet) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 764b6d7..79ee561 100644
index b39007f..d5b1adf 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -951,7 +951,7 @@ public final class CraftServer implements Server {
@ -67,7 +67,7 @@ index 764b6d7..79ee561 100644
for (int j = -short1; j <= short1; j += 16) {
for (int k = -short1; k <= short1; k += 16) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 110f655..98da2ea 100644
index 53fbd38..73aee9b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1264,8 +1264,9 @@ public class CraftWorld implements World {

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

@ -1,14 +1,14 @@
From 625bdb997f98a53fa9bae68dcd188c5fa25c1de5 Mon Sep 17 00:00:00 2001
From 7a195418915f2b6f15e2828a2f73e0e6ef0d24d3 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 55bd44b..22629d4 100644
index d348496..5635646 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -3192,6 +3192,7 @@ public abstract class World implements IBlockAccess {
@@ -3187,6 +3187,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 c9af2b2ad3768b7ed9b20a4ed4d635efcc185424 Mon Sep 17 00:00:00 2001
From 0d0c3c94e75758a00e1082b833d20a928cc56f17 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 22629d4..21f5580 100644
index 5635646..1acb963 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 22629d4..21f5580 100644
public final List<TileEntity> tileEntityListTick = Lists.newArrayList();
private final List<TileEntity> b = Lists.newArrayList();
private final Set<TileEntity> tileEntityListUnload = Sets.newHashSet(); // Paper
@@ -1571,7 +1571,7 @@ public abstract class World implements IBlockAccess {
@@ -1566,7 +1566,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 22629d4..21f5580 100644
this.tileEntityListUnload.clear();
}
// CraftBukkit end
@@ -1622,7 +1622,7 @@ public abstract class World implements IBlockAccess {
@@ -1617,7 +1617,7 @@ public abstract class World implements IBlockAccess {
if (tileentity.y()) {
tilesThisCycle--;
this.tileEntityListTick.remove(tileTickPosition--);
@ -36,7 +36,7 @@ index 22629d4..21f5580 100644
if (this.isLoaded(tileentity.getPosition())) {
this.getChunkAtWorldCoords(tileentity.getPosition()).d(tileentity.getPosition());
}
@@ -1660,7 +1660,7 @@ public abstract class World implements IBlockAccess {
@@ -1655,7 +1655,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 22629d4..21f5580 100644
this.a(tileentity1);
}
// CraftBukkit end
@@ -1680,9 +1680,9 @@ public abstract class World implements IBlockAccess {
@@ -1675,9 +1675,9 @@ public abstract class World implements IBlockAccess {
protected void l() {}
public boolean a(TileEntity tileentity) {
@ -57,7 +57,7 @@ index 22629d4..21f5580 100644
this.tileEntityListTick.add(tileentity);
}
@@ -2116,7 +2116,7 @@ public abstract class World implements IBlockAccess {
@@ -2111,7 +2111,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 c7c0ff11a5a8282cf2f9e36494e7af37003a5020 Mon Sep 17 00:00:00 2001
From 9ff8031d6484e0d3563ee7544fc702ba1fad4506 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 78f50ef..5c6785c 100644
index 49351c8..a9e25d5 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1765,7 +1765,7 @@ public abstract class World implements IBlockAccess {
@@ -1760,7 +1760,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,4 +1,4 @@
From 38897d29689cc81482ced65b581cff9a73aff5a8 Mon Sep 17 00:00:00 2001
From 02c7903ebfbe8ab570d4b8bc08d0521aec472a93 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
@ -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 2465ed7..42b5ebd 100644
index fb346c0..d8c8579 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1801,6 +1801,33 @@ public abstract class World implements IBlockAccess {
@@ -1796,6 +1796,33 @@ public abstract class World implements IBlockAccess {
return this.a(axisalignedbb, (Entity) null);
}
@ -68,7 +68,7 @@ index 2465ed7..42b5ebd 100644
public boolean a(AxisAlignedBB axisalignedbb, @Nullable Entity entity) {
List list = this.getEntities((Entity) null, axisalignedbb);
@@ -2685,7 +2712,7 @@ public abstract class World implements IBlockAccess {
@@ -2680,7 +2707,7 @@ public abstract class World implements IBlockAccess {
AxisAlignedBB axisalignedbb = flag ? null : block.getBlockData().c(this, blockposition);
// CraftBukkit start - store default return
@ -78,7 +78,7 @@ index 2465ed7..42b5ebd 100644
this.getServer().getPluginManager().callEvent(event);
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 3e54f44..b19c74b 100644
index a7f827b..21a8cc7 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -797,6 +797,13 @@ public class CraftEventFactory {

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

@ -1,4 +1,4 @@
From e0fd50f723b617783304a59ecca77e065adea23f Mon Sep 17 00:00:00 2001
From d1f27a90653dc8b1eb4fa9d7c6791d4a282dfbca 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 42b5ebd..e82bf7f 100644
index d8c8579..5cd0dfc 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1334,6 +1334,7 @@ public abstract class World implements IBlockAccess {
@@ -1329,6 +1329,7 @@ public abstract class World implements IBlockAccess {
this.a(entity, axisalignedbb, false, arraylist);
if (entity != null) {

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit f9e044059f493363621a6feb931c17eb9f5e1904
Subproject commit 70bc70b4eefbf98cc624d693ffc4984c64360393