diff --git a/CraftBukkit b/CraftBukkit index 787e724d26..e9fcb5acdf 160000 --- a/CraftBukkit +++ b/CraftBukkit @@ -1 +1 @@ -Subproject commit 787e724d268e8bcc4a14f9d454dcf831ada51981 +Subproject commit e9fcb5acdf68383d0fba5b2396817ae4fcb104f0 diff --git a/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch b/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch index c87c78e3a5..8466983e3b 100644 --- a/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch +++ b/Spigot-Server-Patches/0002-PaperSpigot-config-files.patch @@ -1,4 +1,4 @@ -From b98a3a7904fb5a8a3f341e113319631d4bcd2624 Mon Sep 17 00:00:00 2001 +From a68171e5ec55b704a2f5f3c9125974b2ed9ba49d Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 12 Jul 2014 19:32:01 -0500 Subject: [PATCH] PaperSpigot config files @@ -20,10 +20,10 @@ index 2806f1e..2e38fec 100644 DedicatedServer.LOGGER.info("Generating keypair"); this.a(MinecraftEncryption.b()); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index e6250e1..516447e 100644 +index 8c9568c..f128789 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -179,6 +179,8 @@ public abstract class World implements IBlockAccess { +@@ -192,6 +192,8 @@ public abstract class World implements IBlockAccess { public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot @@ -32,7 +32,7 @@ index e6250e1..516447e 100644 public final SpigotTimings.WorldTimingsHandler timings; // Spigot public CraftWorld getWorld() { -@@ -195,6 +197,7 @@ public abstract class World implements IBlockAccess { +@@ -208,6 +210,7 @@ public abstract class World implements IBlockAccess { protected World(IDataManager idatamanager, WorldData worlddata, WorldProvider worldprovider, MethodProfiler methodprofiler, boolean flag, ChunkGenerator gen, org.bukkit.World.Environment env) { this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot @@ -41,7 +41,7 @@ index e6250e1..516447e 100644 this.world = new CraftWorld((WorldServer) this, gen, env); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index fcb22d9..239cbd7 100644 +index 545fb94..e5426b3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -689,6 +689,7 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0006-Invisible-players-don-t-have-rights.patch b/Spigot-Server-Patches/0006-Invisible-players-don-t-have-rights.patch index 40358c02b9..e6aa79b7cb 100644 --- a/Spigot-Server-Patches/0006-Invisible-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0006-Invisible-players-don-t-have-rights.patch @@ -1,4 +1,4 @@ -From 7772412950502bba4c4f2b0ddb765ff274b554b6 Mon Sep 17 00:00:00 2001 +From 7779f2d84472ab241901b62d6785f79b32f8bd5d Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 28 Nov 2014 00:35:56 -0600 Subject: [PATCH] Invisible players don't have rights @@ -43,10 +43,10 @@ index ce3e628..7fc9abe 100644 if (movingobjectposition.type == EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.PORTAL) { this.aq(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 516447e..1537d76 100644 +index f128789..6788047 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1641,6 +1641,14 @@ public abstract class World implements IBlockAccess { +@@ -1655,6 +1655,14 @@ public abstract class World implements IBlockAccess { for (int i = 0; i < list.size(); ++i) { Entity entity1 = (Entity) list.get(i); diff --git a/Spigot-Server-Patches/0020-Allow-for-toggling-of-spawn-chunks.patch b/Spigot-Server-Patches/0020-Allow-for-toggling-of-spawn-chunks.patch index a7ce69c30a..f522139e0d 100644 --- a/Spigot-Server-Patches/0020-Allow-for-toggling-of-spawn-chunks.patch +++ b/Spigot-Server-Patches/0020-Allow-for-toggling-of-spawn-chunks.patch @@ -1,14 +1,14 @@ -From 319ff111613fd3a97f280692ef8a60c94ec979b9 Mon Sep 17 00:00:00 2001 +From 3d715a4d3462ea6f15c6f3ebcb59f8e04afb2778 Mon Sep 17 00:00:00 2001 From: Dmck2b Date: Fri, 28 Nov 2014 01:53:14 -0600 Subject: [PATCH] Allow for toggling of spawn chunks diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 1537d76..c63617d 100644 +index 6788047..df976aa 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -203,6 +203,7 @@ public abstract class World implements IBlockAccess { +@@ -216,6 +216,7 @@ public abstract class World implements IBlockAccess { this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit this.ticksPerMonsterSpawns = this.getServer().getTicksPerMonsterSpawns(); // CraftBukkit // CraftBukkit end diff --git a/Spigot-Server-Patches/0023-Center-TNT-grid-sample-points.patch b/Spigot-Server-Patches/0023-Center-TNT-grid-sample-points.patch index 074b338b4a..7bed12e8b3 100644 --- a/Spigot-Server-Patches/0023-Center-TNT-grid-sample-points.patch +++ b/Spigot-Server-Patches/0023-Center-TNT-grid-sample-points.patch @@ -1,14 +1,14 @@ -From 3cbb307579d88ea2247c7763420a18a73cb8c433 Mon Sep 17 00:00:00 2001 +From fdcaa4e3ccf4baac17b16f9d7121f3794afc15a0 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Fri, 28 Nov 2014 02:36:18 -0600 Subject: [PATCH] Center TNT grid sample points diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index c63617d..bf697c2 100644 +index df976aa..6528b89 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1847,6 +1847,12 @@ public abstract class World implements IBlockAccess { +@@ -1861,6 +1861,12 @@ public abstract class World implements IBlockAccess { double d1 = 1.0D / ((axisalignedbb.e - axisalignedbb.b) * 2.0D + 1.0D); double d2 = 1.0D / ((axisalignedbb.f - axisalignedbb.c) * 2.0D + 1.0D); @@ -21,7 +21,7 @@ index c63617d..bf697c2 100644 if (d0 >= 0.0D && d1 >= 0.0D && d2 >= 0.0D) { int i = 0; int j = 0; -@@ -1858,7 +1864,7 @@ public abstract class World implements IBlockAccess { +@@ -1872,7 +1878,7 @@ public abstract class World implements IBlockAccess { double d4 = axisalignedbb.b + (axisalignedbb.e - axisalignedbb.b) * (double) f1; double d5 = axisalignedbb.c + (axisalignedbb.f - axisalignedbb.c) * (double) f2; diff --git a/Spigot-Server-Patches/0024-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0024-Player-affects-spawning-API.patch index 8c11401fa7..d41903cd6b 100644 --- a/Spigot-Server-Patches/0024-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0024-Player-affects-spawning-API.patch @@ -1,4 +1,4 @@ -From 325cee0020dfc470cae368187992852c4face538 Mon Sep 17 00:00:00 2001 +From 68be838276d9de5156026f7fe214f3bb0265ccb1 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Fri, 28 Nov 2014 03:31:21 -0600 Subject: [PATCH] Player affects spawning API @@ -67,7 +67,7 @@ index 43954b3..932a572 100644 biomemeta = worldserver.a(enumcreaturetype, blockposition2); if (biomemeta == null) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index bf697c2..91c0a2f 100644 +index 6528b89..5a2634a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -2,14 +2,13 @@ package net.minecraft.server; @@ -94,7 +94,7 @@ index bf697c2..91c0a2f 100644 import org.bukkit.craftbukkit.SpigotTimings; // Spigot import org.bukkit.generator.ChunkGenerator; import org.bukkit.craftbukkit.CraftServer; -@@ -2754,6 +2752,50 @@ public abstract class World implements IBlockAccess { +@@ -2768,6 +2766,50 @@ public abstract class World implements IBlockAccess { return false; } @@ -146,7 +146,7 @@ index bf697c2..91c0a2f 100644 for (int i = 0; i < this.players.size(); ++i) { EntityHuman entityhuman = (EntityHuman) this.players.get(i); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 2d4398e..914187d 100644 +index d006fb6..78c376d 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 { diff --git a/Spigot-Server-Patches/0030-Remove-specific-entities-that-fly-through-an-unloade.patch b/Spigot-Server-Patches/0030-Remove-specific-entities-that-fly-through-an-unloade.patch index 43bbffb250..ef59d0dcc8 100644 --- a/Spigot-Server-Patches/0030-Remove-specific-entities-that-fly-through-an-unloade.patch +++ b/Spigot-Server-Patches/0030-Remove-specific-entities-that-fly-through-an-unloade.patch @@ -1,4 +1,4 @@ -From 35c03515abddae64498a2d966183bf1ca0c497b2 Mon Sep 17 00:00:00 2001 +From 8a2a12231d353beb66545da4fd35bcb90a3a6173 Mon Sep 17 00:00:00 2001 From: Iceee Date: Fri, 28 Nov 2014 12:11:03 -0600 Subject: [PATCH] Remove specific entities that fly through an unloaded chunk @@ -70,10 +70,10 @@ index 4823698..7b856ef 100644 this.motY *= 0.9800000190734863D; this.motZ *= 0.9800000190734863D; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 13a6169..c217a91 100644 +index bdb4a1b..d860a1b 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1138,6 +1138,7 @@ public abstract class World implements IBlockAccess { +@@ -1152,6 +1152,7 @@ public abstract class World implements IBlockAccess { { if ( !this.isChunkLoaded( chunkx, chunkz, true ) ) { @@ -81,7 +81,7 @@ index 13a6169..c217a91 100644 continue; } int cz = chunkz << 4; -@@ -1555,6 +1556,14 @@ public abstract class World implements IBlockAccess { +@@ -1569,6 +1570,14 @@ public abstract class World implements IBlockAccess { if (!org.spigotmc.ActivationRange.checkIfActive(entity)) { entity.ticksLived++; entity.inactiveTick(); diff --git a/Spigot-Server-Patches/0033-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0033-Further-improve-server-tick-loop.patch index b6edf75d33..19b9191dd3 100644 --- a/Spigot-Server-Patches/0033-Further-improve-server-tick-loop.patch +++ b/Spigot-Server-Patches/0033-Further-improve-server-tick-loop.patch @@ -1,4 +1,4 @@ -From 0a8abf013236bcecd16ad30c61c62d4f9aa85dfd Mon Sep 17 00:00:00 2001 +From c1fd3c7f88ca3987c954a398127e0f81bc035457 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 28 Nov 2014 12:48:26 -0600 Subject: [PATCH] Further improve server tick loop @@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly. Switch to a realistic rolling average and factor in std deviation as an extra reporting variable diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index bdaf6fb..189fe12 100644 +index f47ea18..89c6c2c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -113,17 +113,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs @@ -150,10 +150,10 @@ index bdaf6fb..189fe12 100644 lastTick = curTime; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 239cbd7..dca6f17 100644 +index e5426b3..1ecd9d0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1681,6 +1681,17 @@ public final class CraftServer implements Server { +@@ -1685,6 +1685,17 @@ public final class CraftServer implements Server { private final Spigot spigot = new Spigot() {