diff --git a/CraftBukkit b/CraftBukkit index 0ff499cf03..8e5eab2655 160000 --- a/CraftBukkit +++ b/CraftBukkit @@ -1 +1 @@ -Subproject commit 0ff499cf03a013e8999042d6e758ecab6ddf41b6 +Subproject commit 8e5eab26554f734da63ff4deb13068a69873e949 diff --git a/Spigot-Server-Patches/0004-Timings-v2.patch b/Spigot-Server-Patches/0004-Timings-v2.patch index 23a495aa46..3c5f4855f9 100644 --- a/Spigot-Server-Patches/0004-Timings-v2.patch +++ b/Spigot-Server-Patches/0004-Timings-v2.patch @@ -1,4 +1,4 @@ -From 1daf7fee6071727b2982a24b2c05057357c6e83d Mon Sep 17 00:00:00 2001 +From 516d534d631e3e9950b2c834555fb819f6ffac1e Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -399,7 +399,7 @@ index 1bd2d38..1ad0594 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4cc436d..ceb5bcc 100644 +index 5664994..eac4e79 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -45,7 +45,7 @@ import org.bukkit.craftbukkit.CraftServer; @@ -528,7 +528,7 @@ index e6524e9..4193f20 100644 private static Map> f = Maps.newHashMap(); private static Map, String> g = Maps.newHashMap(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 8c163ee..8221f4e 100644 +index 59b7dd2..6d5eb6a 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; @@ -600,7 +600,7 @@ index 8c163ee..8221f4e 100644 crashreport1 = CrashReport.a(throwable1, "Ticking entity"); crashreportsystemdetails1 = crashreport1.a("Entity being ticked"); entity.appendEntityCrashDetails(crashreportsystemdetails1); -@@ -1548,6 +1552,7 @@ public abstract class World implements IBlockAccess { +@@ -1554,6 +1558,7 @@ public abstract class World implements IBlockAccess { } timings.tileEntityPending.stopTiming(); // Spigot @@ -608,7 +608,7 @@ index 8c163ee..8221f4e 100644 this.methodProfiler.b(); this.methodProfiler.b(); } -@@ -1593,7 +1598,6 @@ public abstract class World implements IBlockAccess { +@@ -1599,7 +1604,6 @@ public abstract class World implements IBlockAccess { entity.ticksLived++; entity.inactiveTick(); } else { @@ -616,7 +616,7 @@ index 8c163ee..8221f4e 100644 // CraftBukkit end entity.M = entity.locX; entity.N = entity.locY; -@@ -1602,6 +1606,7 @@ public abstract class World implements IBlockAccess { +@@ -1608,6 +1612,7 @@ public abstract class World implements IBlockAccess { entity.lastPitch = entity.pitch; if (flag && entity.aa) { ++entity.ticksLived; @@ -624,7 +624,7 @@ index 8c163ee..8221f4e 100644 if (entity.isPassenger()) { entity.aw(); } else { -@@ -1660,8 +1665,6 @@ public abstract class World implements IBlockAccess { +@@ -1666,8 +1671,6 @@ public abstract class World implements IBlockAccess { } } } @@ -1133,5 +1133,5 @@ index e53092c..0b057fa 100644 } } -- -2.7.1.windows.2 +2.7.4 diff --git a/Spigot-Server-Patches/0005-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0005-Vanished-players-don-t-have-rights.patch index 11b030ffcf..e8da501b5d 100644 --- a/Spigot-Server-Patches/0005-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0005-Vanished-players-don-t-have-rights.patch @@ -1,4 +1,4 @@ -From b2b9a224ccc7283995a204a95171fbe3992be325 Mon Sep 17 00:00:00 2001 +From da7727914a2119d762d3b77b90f6e323163a531a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 21:20:21 -0600 Subject: [PATCH] Vanished players don't have rights @@ -75,10 +75,10 @@ index 300573a..6eeb03b 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 8221f4e..acf7ad8 100644 +index 6d5eb6a..72dfc66 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1678,6 +1678,14 @@ public abstract class World implements IBlockAccess { +@@ -1684,6 +1684,14 @@ public abstract class World implements IBlockAccess { for (int i = 0; i < list.size(); ++i) { Entity entity1 = (Entity) list.get(i); @@ -94,5 +94,5 @@ index 8221f4e..acf7ad8 100644 return false; } -- -2.7.1.windows.2 +2.7.4 diff --git a/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch index c5ecdaed81..e869c14a2b 100644 --- a/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0018-Player-affects-spawning-API.patch @@ -1,4 +1,4 @@ -From ee39ef5ad66dbdc6f970a9257efdef116712b3fe Mon Sep 17 00:00:00 2001 +From 93881570845dac907b09471b5dbdefec903fbdf2 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Tue, 1 Mar 2016 14:47:52 -0600 Subject: [PATCH] Player affects spawning API @@ -65,10 +65,10 @@ index 9e19dfd..b724586 100644 biomebase_biomemeta = worldserver.a(enumcreaturetype, (BlockPosition) blockposition_mutableblockposition); if (biomebase_biomemeta == null) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 378d71b..0d7e962 100644 +index 17c0b00..9124558 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -2682,6 +2682,53 @@ public abstract class World implements IBlockAccess { +@@ -2688,6 +2688,53 @@ public abstract class World implements IBlockAccess { return i; } @@ -146,5 +146,5 @@ index 90de39a..4bf9c71 100644 private final Player.Spigot spigot = new Player.Spigot() { -- -2.7.1.windows.2 +2.7.4 diff --git a/Spigot-Server-Patches/0021-Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/0021-Optimize-TileEntity-Ticking.patch index 58a745d5ba..af95126dd4 100644 --- a/Spigot-Server-Patches/0021-Optimize-TileEntity-Ticking.patch +++ b/Spigot-Server-Patches/0021-Optimize-TileEntity-Ticking.patch @@ -1,4 +1,4 @@ -From 311c19853625487562f9e9e9fc53b1feab3d5218 Mon Sep 17 00:00:00 2001 +From 51149a1548ebefd3cf6296a1f0f6f6b715f7a3b5 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 22:01:19 -0600 Subject: [PATCH] Optimize TileEntity Ticking @@ -187,7 +187,7 @@ index e454622..d01b65a 100644 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 0d7e962..3b7c16e 100644 +index 9124558..2ccfa1b 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -60,7 +60,7 @@ public abstract class World implements IBlockAccess { @@ -217,7 +217,7 @@ index 0d7e962..3b7c16e 100644 if (this.isLoaded(tileentity.getPosition())) { this.getChunkAtWorldCoords(tileentity.getPosition()).d(tileentity.getPosition()); } -@@ -1561,7 +1561,7 @@ public abstract class World implements IBlockAccess { +@@ -1567,7 +1567,7 @@ public abstract class World implements IBlockAccess { protected void l() {} public boolean a(TileEntity tileentity) { @@ -226,7 +226,7 @@ index 0d7e962..3b7c16e 100644 if (flag && tileentity instanceof ITickable) { this.tileEntityListTick.add(tileentity); -@@ -2032,7 +2032,7 @@ public abstract class World implements IBlockAccess { +@@ -2038,7 +2038,7 @@ public abstract class World implements IBlockAccess { } else { if (tileentity != null) { this.b.remove(tileentity); @@ -236,5 +236,5 @@ index 0d7e962..3b7c16e 100644 } -- -2.7.1.windows.2 +2.7.4 diff --git a/Spigot-Server-Patches/0107-Optimize-isValidLocation-for-inlining.patch b/Spigot-Server-Patches/0107-Optimize-isValidLocation-for-inlining.patch index 91941b5803..d5bba2b165 100644 --- a/Spigot-Server-Patches/0107-Optimize-isValidLocation-for-inlining.patch +++ b/Spigot-Server-Patches/0107-Optimize-isValidLocation-for-inlining.patch @@ -1,4 +1,4 @@ -From 8eb1640efd765ee190b892daaf1be6c45ba1488f Mon Sep 17 00:00:00 2001 +From a17ff1e8481c51527b7dab89a11a1d4c991e9817 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 23:41:34 -0400 Subject: [PATCH] Optimize isValidLocation for inlining @@ -22,7 +22,7 @@ index f0908a2..d1688e1 100644 public BaseBlockPosition(int i, int j, int k) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 0419eb4..90b4367 100644 +index 2033982..9ad2501 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -284,8 +284,8 @@ public abstract class World implements IBlockAccess { @@ -99,7 +99,7 @@ index 0419eb4..90b4367 100644 return Blocks.AIR.getBlockData(); } else { Chunk chunk = this.getChunkAtWorldCoords(blockposition); -@@ -2050,7 +2050,7 @@ public abstract class World implements IBlockAccess { +@@ -2056,7 +2056,7 @@ public abstract class World implements IBlockAccess { public Map capturedTileEntities = Maps.newHashMap(); public TileEntity getTileEntity(BlockPosition blockposition) { @@ -108,7 +108,7 @@ index 0419eb4..90b4367 100644 return null; } else { // CraftBukkit start -@@ -2153,7 +2153,7 @@ public abstract class World implements IBlockAccess { +@@ -2159,7 +2159,7 @@ public abstract class World implements IBlockAccess { } public boolean d(BlockPosition blockposition, boolean flag) { @@ -118,5 +118,5 @@ index 0419eb4..90b4367 100644 } else { Chunk chunk = this.chunkProvider.getLoadedChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4); -- -2.7.1.windows.2 +2.7.4