diff --git a/Bukkit-Patches/0028-Fix-slow-tab-complete-for-some-commands.patch b/Bukkit-Patches/0028-Fix-slow-tab-complete-for-some-commands.patch new file mode 100644 index 0000000..17e191e --- /dev/null +++ b/Bukkit-Patches/0028-Fix-slow-tab-complete-for-some-commands.patch @@ -0,0 +1,36 @@ +From 1aa49f17b57768c68ddfe4be0a7ec9f86d0facbc Mon Sep 17 00:00:00 2001 +From: md_5 +Date: Tue, 22 Jul 2014 21:01:32 +1000 +Subject: [PATCH] Fix slow tab complete for some commands. + +Use online players instead of offline players, which is very slow. + +diff --git a/src/main/java/org/bukkit/command/defaults/DeopCommand.java b/src/main/java/org/bukkit/command/defaults/DeopCommand.java +index 1b71d49..8a571e8 100644 +--- a/src/main/java/org/bukkit/command/defaults/DeopCommand.java ++++ b/src/main/java/org/bukkit/command/defaults/DeopCommand.java +@@ -49,7 +49,7 @@ public class DeopCommand extends VanillaCommand { + + if (args.length == 1) { + List completions = new ArrayList(); +- for (OfflinePlayer player : Bukkit.getOfflinePlayers()) { ++ for (OfflinePlayer player : Bukkit.getOnlinePlayers()) { // Spigot - offline players is slow + String playerName = player.getName(); + if (player.isOp() && StringUtil.startsWithIgnoreCase(playerName, args[0])) { + completions.add(playerName); +diff --git a/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java b/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java +index b3fa4f8..fd81ee3 100644 +--- a/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java ++++ b/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java +@@ -104,7 +104,7 @@ public class WhitelistCommand extends VanillaCommand { + } else if (args.length == 2) { + if (args[0].equalsIgnoreCase("add")) { + List completions = new ArrayList(); +- for (OfflinePlayer player : Bukkit.getOfflinePlayers()) { ++ for (OfflinePlayer player : Bukkit.getOnlinePlayers()) { // Spigot - offline players is slow + String name = player.getName(); + if (StringUtil.startsWithIgnoreCase(name, args[1]) && !player.isWhitelisted()) { + completions.add(name); +-- +1.9.1 + diff --git a/CraftBukkit-Patches/0016-Entity-Activation-Range.patch b/CraftBukkit-Patches/0016-Entity-Activation-Range.patch index afb1768..3a63991 100644 --- a/CraftBukkit-Patches/0016-Entity-Activation-Range.patch +++ b/CraftBukkit-Patches/0016-Entity-Activation-Range.patch @@ -1,4 +1,4 @@ -From 72e1c5a2f9954a7dafbf3ccfc9477330df7bc861 Mon Sep 17 00:00:00 2001 +From cfcb841610de88493e4af2b87a309bfb4ea126f5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Feb 2013 05:10:21 -0500 Subject: [PATCH] Entity Activation Range @@ -197,7 +197,7 @@ index 558574f..41d2d87 100644 public static final HashMap pluginTaskTimingMap = new HashMap(); diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java new file mode 100644 -index 0000000..84a7dd6 +index 0000000..903172a --- /dev/null +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -0,0 +1,296 @@ @@ -327,7 +327,7 @@ index 0000000..84a7dd6 + maxRange = Math.max( maxRange, miscActivationRange ); + maxRange = Math.min( ( world.spigotConfig.viewDistance << 4 ) - 8, maxRange ); + -+ for ( Entity player : new ArrayList( world.players ) ) ++ for ( Entity player : (List) world.players ) + { + + player.activatedTick = MinecraftServer.currentTick; diff --git a/CraftBukkit-Patches/0162-Make-moved-wrongly-limit-configurable.patch b/CraftBukkit-Patches/0162-Make-moved-wrongly-limit-configurable.patch new file mode 100644 index 0000000..bb02399 --- /dev/null +++ b/CraftBukkit-Patches/0162-Make-moved-wrongly-limit-configurable.patch @@ -0,0 +1,44 @@ +From 15597ddb21ca4af28df3fef88ed70672dc71cbd2 Mon Sep 17 00:00:00 2001 +From: Jonas Konrad +Date: Fri, 4 Jul 2014 23:03:13 +0200 +Subject: [PATCH] Make "moved wrongly" limit configurable + + +diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java +index 9a7b256..f064f6e 100644 +--- a/src/main/java/net/minecraft/server/PlayerConnection.java ++++ b/src/main/java/net/minecraft/server/PlayerConnection.java +@@ -399,7 +399,8 @@ public class PlayerConnection implements PacketPlayInListener { + d10 = d4 * d4 + d5 * d5 + d6 * d6; + boolean flag1 = false; + +- if (d10 > 0.0625D && !this.player.isSleeping() && !this.player.playerInteractManager.isCreative()) { ++ // Spigot: make "moved wrongly" limit configurable ++ if (d10 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.playerInteractManager.isCreative()) { + flag1 = true; + c.warn(this.player.getName() + " moved wrongly!"); + } +diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java +index 7998aac..2e6e172 100644 +--- a/src/main/java/org/spigotmc/SpigotConfig.java ++++ b/src/main/java/org/spigotmc/SpigotConfig.java +@@ -327,4 +327,16 @@ public class SpigotConfig + { + intCacheLimit = getInt( "settings.int-cache-limit", 1024 ); + } ++ ++ private static double getDouble(String path, double def) ++ { ++ config.addDefault( path, def ); ++ return config.getDouble( path, config.getDouble( path ) ); ++ } ++ ++ public static double movedWronglyThreshold; ++ private static void movedWronglyThreshold() ++ { ++ movedWronglyThreshold = getDouble( "settings.moved-wrongly-threshold", 0.0625D ); ++ } + } +-- +1.9.1 + diff --git a/Spigot-Server-Patches/0024-Fix-Null-Tile-Entity-Worlds.patch b/CraftBukkit-Patches/0163-Fix-Null-Tile-Entity-Worlds.patch similarity index 70% rename from Spigot-Server-Patches/0024-Fix-Null-Tile-Entity-Worlds.patch rename to CraftBukkit-Patches/0163-Fix-Null-Tile-Entity-Worlds.patch index fbc4b29..003ad99 100644 --- a/Spigot-Server-Patches/0024-Fix-Null-Tile-Entity-Worlds.patch +++ b/CraftBukkit-Patches/0163-Fix-Null-Tile-Entity-Worlds.patch @@ -1,18 +1,18 @@ -From 3acbb3aac1c9465f406b4dedbff3f070fa3d7974 Mon Sep 17 00:00:00 2001 +From d7749ced81fc9e90c14af68156bfe0ecbeb71a1f Mon Sep 17 00:00:00 2001 From: "Evan A. Haskell" Date: Thu, 26 Jun 2014 18:37:29 -0400 Subject: [PATCH] Fix Null Tile Entity Worlds diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index db025bf..ebba06e 100644 +index 3dba573..6100297 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -2012,6 +2012,7 @@ public abstract class World implements IBlockAccess { +@@ -2002,6 +2002,7 @@ public abstract class World implements IBlockAccess { } } -+ tileentity.a(this); // PaperSpigot - No null worlds ++ tileentity.a(this); // Spigot - No null worlds this.a.add(tileentity); } else { this.tileEntityList.add(tileentity); diff --git a/Spigot-Server-Patches/0020-Toggle-for-player-interact-limiter.patch b/Spigot-Server-Patches/0020-Toggle-for-player-interact-limiter.patch index e980896..633a5eb 100644 --- a/Spigot-Server-Patches/0020-Toggle-for-player-interact-limiter.patch +++ b/Spigot-Server-Patches/0020-Toggle-for-player-interact-limiter.patch @@ -1,11 +1,11 @@ -From 9e7a82050008d416ebe798741ad303dcc11b86e8 Mon Sep 17 00:00:00 2001 +From bbc895c7c73ab8e4a2f2cedf152264f9afbf64db Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 16 Jul 2014 14:11:08 -0500 Subject: [PATCH] Toggle for player interact limiter diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 9a7b256..dd63b9f 100644 +index f064f6e..f6a1319 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -59,6 +59,8 @@ import org.bukkit.inventory.InventoryView; @@ -17,7 +17,7 @@ index 9a7b256..dd63b9f 100644 public class PlayerConnection implements PacketPlayInListener { private static final Logger c = LogManager.getLogger(); -@@ -578,7 +580,7 @@ public class PlayerConnection implements PacketPlayInListener { +@@ -579,7 +581,7 @@ public class PlayerConnection implements PacketPlayInListener { public void a(PacketPlayInBlockPlace packetplayinblockplace) { boolean throttled = false; diff --git a/Spigot-Server-Patches/0025-Better-EULA-handling.patch b/Spigot-Server-Patches/0024-Better-EULA-handling.patch similarity index 98% rename from Spigot-Server-Patches/0025-Better-EULA-handling.patch rename to Spigot-Server-Patches/0024-Better-EULA-handling.patch index 2dc1968..c50ef65 100644 --- a/Spigot-Server-Patches/0025-Better-EULA-handling.patch +++ b/Spigot-Server-Patches/0024-Better-EULA-handling.patch @@ -1,4 +1,4 @@ -From fbb0da30ac930a9c6a33f91656dc5d3d3f7ca8f0 Mon Sep 17 00:00:00 2001 +From f9963b2942e34664e4940ef0507ce7ac2ea62c14 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 8 Jul 2014 22:39:41 -0500 Subject: [PATCH] Better EULA handling diff --git a/Spigot-Server-Patches/0026-Configurable-nerf-for-TNT-cannons.patch b/Spigot-Server-Patches/0025-Configurable-nerf-for-TNT-cannons.patch similarity index 96% rename from Spigot-Server-Patches/0026-Configurable-nerf-for-TNT-cannons.patch rename to Spigot-Server-Patches/0025-Configurable-nerf-for-TNT-cannons.patch index d250bb9..87599a4 100644 --- a/Spigot-Server-Patches/0026-Configurable-nerf-for-TNT-cannons.patch +++ b/Spigot-Server-Patches/0025-Configurable-nerf-for-TNT-cannons.patch @@ -1,4 +1,4 @@ -From 49fd125cb37272abe6d6d4b2b6b8c3be7deebfbc Mon Sep 17 00:00:00 2001 +From 7157550a84f45bb3e4d87f417585e46699aacf2a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 9 Jul 2014 17:38:48 -0500 Subject: [PATCH] Configurable nerf for TNT cannons diff --git a/Spigot-Server-Patches/0027-Don-t-tick-chests.patch b/Spigot-Server-Patches/0026-Don-t-tick-chests.patch similarity index 97% rename from Spigot-Server-Patches/0027-Don-t-tick-chests.patch rename to Spigot-Server-Patches/0026-Don-t-tick-chests.patch index 57a9a48..14df41f 100644 --- a/Spigot-Server-Patches/0027-Don-t-tick-chests.patch +++ b/Spigot-Server-Patches/0026-Don-t-tick-chests.patch @@ -1,4 +1,4 @@ -From ef4ab5f86149437096e723259d8e259f3f97b63d Mon Sep 17 00:00:00 2001 +From 9d0c463f0d044f4f7f291ee25f8755a2eccf7aba Mon Sep 17 00:00:00 2001 From: Iceee Date: Fri, 11 Jul 2014 01:31:43 -0500 Subject: [PATCH] Don't tick chests diff --git a/Spigot-Server-Patches/0028-Configurable-AI-target-selector-delay.patch b/Spigot-Server-Patches/0027-Configurable-AI-target-selector-delay.patch similarity index 97% rename from Spigot-Server-Patches/0028-Configurable-AI-target-selector-delay.patch rename to Spigot-Server-Patches/0027-Configurable-AI-target-selector-delay.patch index 45b17f7..9118302 100644 --- a/Spigot-Server-Patches/0028-Configurable-AI-target-selector-delay.patch +++ b/Spigot-Server-Patches/0027-Configurable-AI-target-selector-delay.patch @@ -1,4 +1,4 @@ -From e75aadc53a83fda0c3ffc2a463cffc5721314d1d Mon Sep 17 00:00:00 2001 +From 6ae22ba0f985aa7b9b5a05d5da742bd9764c109a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 14 Jul 2014 01:20:46 -0500 Subject: [PATCH] Configurable AI target selector delay