CatMC-Network/PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream merge

Browse Source
This commit is contained in:
Thinkofdeath 2014-02-12 13:48:26 +00:00
parent 5aad14d2b6
commit 5284bd1a74
75 changed files with 299 additions and 753 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bukkit

@ -1 +1 @@
Subproject commit a621d1683a1070043cc7febc293caf5f60615182
Subproject commit 66daa8a96c81c7c041215f02eae2f452ef512047

8
Bukkit-Patches/0001-POM-Changes.patch
View File

@ -1,11 +1,11 @@
From ecf8a9f407c07efd658bfc06ca1c2628925c66f2 Mon Sep 17 00:00:00 2001
From 92ffae9c8707c17a643cb877d92f3e0fa9d23bcc Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 10:36:24 +1000
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index 6c07c03..efb3262 100644
index 50f9bae..fb303e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,43 +1,23 @@
@ -23,7 +23,7 @@ index 6c07c03..efb3262 100644
+
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot-api</artifactId>
<version>1.7.2-R0.3-SNAPSHOT</version>
<version>1.7.2-R0.4-SNAPSHOT</version>
- <name>Bukkit</name>
- <url>http://www.bukkit.org</url>
+ <name>Spigot-API</name>
@ -65,5 +65,5 @@ index 6c07c03..efb3262 100644
<plugins>
<plugin>
--
1.8.3.2
1.8.4.msysgit.0

8
Bukkit-Patches/0002-Measure-Timings-Duration.patch
View File

@ -1,4 +1,4 @@
From 9e3fffd5a97e355ca42d86c9ef445efe2b58516f Mon Sep 17 00:00:00 2001
From 2674d1cc80c1aba22c182561dd5da0b048a33b7c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 2 Jun 2013 10:42:57 +1000
Subject: [PATCH] Measure Timings Duration
@ -37,10 +37,10 @@ index 05cfcb0..c2874f1 100644
if (separate) sender.sendMessage("Names written to " + names.getPath());
} catch (IOException e) {
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 3c9611b..2c4b03b 100644
index 787dcfe..b870ecd 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -275,6 +275,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -280,6 +280,7 @@ public final class SimplePluginManager implements PluginManager {
}
}
@ -49,5 +49,5 @@ index 3c9611b..2c4b03b 100644
}
--
1.8.3.2
1.8.4.msysgit.0

32
Bukkit-Patches/0020-Allow-for-fallback-commands-to-be-removed.patch
View File

@ -1,32 +0,0 @@
From 7a4e9a52584e1a01c04a7c8cd0d17743f6fd6414 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 18 Dec 2013 10:19:50 +1100
Subject: [PATCH] Allow for fallback commands to be removed.
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index 9ae0bce..53c9207 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -333,4 +333,18 @@ public class SimpleCommandMap implements CommandMap {
}
}
}
+
+ // Spigot Start
+ public static void removeFallback(String name)
+ {
+ Iterator<VanillaCommand> it = fallbackCommands.iterator();
+ while ( it.hasNext() )
+ {
+ if ( it.next().getName().equals( name ) )
+ {
+ it.remove();
+ }
+ }
+ }
+ // Spigot End
}
--
1.8.3.2

12
Bukkit-Patches/0021-Fix-Tab-Completion-for-Some-Commands.patch → Bukkit-Patches/0020-Fix-Tab-Completion-for-Some-Commands.patch
View File

@ -1,4 +1,4 @@
From 9bbc5d1b1da84518c2b6bc5fa2bca12a16429594 Mon Sep 17 00:00:00 2001
From 600904b4ab7510e3a9915305e720122073b7064b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 24 Dec 2013 10:14:25 +1100
Subject: [PATCH] Fix Tab Completion for Some Commands
@ -39,12 +39,12 @@ index ffbcac1..16dfdbd 100644
+ // Spigot End
}
diff --git a/src/main/java/org/bukkit/command/defaults/TellCommand.java b/src/main/java/org/bukkit/command/defaults/TellCommand.java
index d0aa102..0c2c9a1 100644
index 287f49f..fc49207 100644
--- a/src/main/java/org/bukkit/command/defaults/TellCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/TellCommand.java
@@ -48,4 +48,16 @@ public class TellCommand extends VanillaCommand {
public boolean matches(String input) {
return input.equalsIgnoreCase("tell") || input.equalsIgnoreCase("w") || input.equalsIgnoreCase("msg");
@@ -45,4 +45,16 @@ public class TellCommand extends VanillaCommand {
return true;
}
+
+ // Spigot Start
@ -81,5 +81,5 @@ index c9ac1ce..a687fef 100644
+ // Spigot End
}
--
1.8.3.2
1.8.4.msysgit.0

4
Bukkit-Patches/0022-Add-Spigot-Links.patch → Bukkit-Patches/0021-Add-Spigot-Links.patch
View File

@ -1,4 +1,4 @@
From 14c006ae726e917824a6bd4e394582f4834a2d28 Mon Sep 17 00:00:00 2001
From 250fe28a27eff40f1725c1cf1384f06551e76dea Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 23 Jan 2014 13:17:38 +1100
Subject: [PATCH] Add Spigot Links
@ -25,5 +25,5 @@ index a51766e..1905b8d 100644
Compilation
-----------
--
1.8.3.2
1.8.4.msysgit.0

6
Bukkit-Patches/0023-Implement-Locale-Getter-for-Players.patch → Bukkit-Patches/0022-Implement-Locale-Getter-for-Players.patch
View File

@ -1,11 +1,11 @@
From a75411c70903a67ed6353397dc4513551fb61d7a Mon Sep 17 00:00:00 2001
From 84f288a09f1bd1e57582a8cdab93a413a0cef7e0 Mon Sep 17 00:00:00 2001
From: Smove <jan@lavasurvival.net>
Date: Sat, 1 Feb 2014 18:10:49 +1100
Subject: [PATCH] Implement Locale Getter for Players
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index adef230..8489bc9 100644
index 5a8c13e..204c4b2 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1067,6 +1067,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@ -26,5 +26,5 @@ index adef230..8489bc9 100644
Spigot spigot();
--
1.8.3.2
1.8.4.msysgit.0

6
Bukkit-Patches/0024-Add-support-for-fetching-hidden-players.patch → Bukkit-Patches/0023-Add-support-for-fetching-hidden-players.patch
View File

@ -1,11 +1,11 @@
From 40166667a533e1ae2f6da758b14ebe7c17fb5b48 Mon Sep 17 00:00:00 2001
From 874417c9a73472f62a4ba3bfbeac8db77d0831eb Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Sun, 9 Feb 2014 14:02:11 -0500
Subject: [PATCH] Add support for fetching hidden players
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 8489bc9..d18ca2d 100644
index 204c4b2..6237663 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1077,6 +1077,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@ -26,5 +26,5 @@ index 8489bc9..d18ca2d 100644
Spigot spigot();
--
1.7.10.4
1.8.4.msysgit.0

2
CraftBukkit

@ -1 +1 @@
Subproject commit 616c371a77a89e746af16cc29bb5a0a204e70cc4
Subproject commit 85f5776df2a9c827565e799f150ae8a197086a98

10
CraftBukkit-Patches/0001-POM-Changes.patch
View File

@ -1,11 +1,11 @@
From 7a2be87999849e59b8ab48ec8e484a107ec49117 Mon Sep 17 00:00:00 2001
From 7b88347fa436856bff54d6f6a10bbad8e4941e5e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 13:07:39 +1000
Subject: [PATCH] POM Changes
diff --git a/pom.xml b/pom.xml
index 2f06c8e..bec994f 100644
index b9bbeef..a3e555c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,20 @@
@ -25,7 +25,7 @@ index 2f06c8e..bec994f 100644
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot</artifactId>
<packaging>jar</packaging>
<version>1.7.2-R0.3-SNAPSHOT</version>
<version>1.7.2-R0.4-SNAPSHOT</version>
- <name>CraftBukkit</name>
- <url>http://www.bukkit.org</url>
+ <name>Spigot</name>
@ -142,10 +142,10 @@ index 2f06c8e..bec994f 100644
<execution>
<phase>package</phase>
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d27ab8c..e4d7a05 100644
index e6c8575..e33af61 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -225,7 +225,7 @@ public final class CraftServer implements Server {
@@ -303,7 +303,7 @@ public final class CraftServer implements Server {
loadIcon();
updater = new AutoUpdater(new BukkitDLUpdaterService(configuration.getString("auto-updater.host")), getLogger(), configuration.getString("auto-updater.preferred-channel"));

6
CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
View File

@ -1,4 +1,4 @@
From 8ee072a2329fa1ab8b7540a18c633dd8dee8d549 Mon Sep 17 00:00:00 2001
From ec47c27cbee89a54bc68d4fa7b25b86653034326 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
@ -64,10 +64,10 @@ index fe0f200..e026c1f 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 9935e7a..6b7fcfc 100644
index 60b0435..573f9a5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1254,4 +1254,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1252,4 +1252,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
collection.add(new AttributeModifiable(getHandle().bc(), (new AttributeRanged("generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true)));
}

17
CraftBukkit-Patches/0004-Spigot-Configuration.patch
View File

@ -1,4 +1,4 @@
From 57b4275cba2ec0d77c900c51383f3e41375df5b9 Mon Sep 17 00:00:00 2001
From 1c7ef189534ecaf5de7bdcc9db234088c7dc172e Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 7 Jul 2013 09:32:53 +1000
Subject: [PATCH] Spigot Configuration
@ -34,7 +34,7 @@ index 30ce5f4..c9bb3a6 100644
if (!this.getOnlineMode()) {
h.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index f850a0f..cd529ec 100644
index 4a42bb4..5f12d2e 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -107,6 +107,7 @@ public abstract class World implements IBlockAccess {
@ -54,10 +54,10 @@ index f850a0f..cd529ec 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 e4d7a05..d5c1ffb 100644
index e33af61..4d46178 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -231,8 +231,10 @@ public final class CraftServer implements Server {
@@ -309,8 +309,10 @@ public final class CraftServer implements Server {
updater.getOnUpdate().addAll(configuration.getStringList("auto-updater.on-update"));
updater.check(serverVersion);
@ -69,8 +69,8 @@ index e4d7a05..d5c1ffb 100644
+ // Spigot End
}
private File getConfigFile() {
@@ -582,6 +584,7 @@ public final class CraftServer implements Server {
public boolean getCommandBlockOverride(String command) {
@@ -723,6 +725,7 @@ public final class CraftServer implements Server {
playerList.getIPBans().load();
playerList.getNameBans().load();
@ -78,7 +78,7 @@ index e4d7a05..d5c1ffb 100644
for (WorldServer world : console.worlds) {
world.difficulty = difficulty;
world.setSpawnFlags(monsters, animals);
@@ -596,11 +599,13 @@ public final class CraftServer implements Server {
@@ -737,11 +740,14 @@ public final class CraftServer implements Server {
} else {
world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
}
@ -89,9 +89,10 @@ index e4d7a05..d5c1ffb 100644
commandMap.clearCommands();
resetRecipes();
+ org.spigotmc.SpigotConfig.registerCommands(); // Spigot
+
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
int pollCount = 0;
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
new file mode 100644
index 0000000..3dfe4ed

10
CraftBukkit-Patches/0005-Better-Chunk-Tick-Selection.patch
View File

@ -1,14 +1,14 @@
From 11f449c45b4450a0c4641fe4e8de3b1abe1a1429 Mon Sep 17 00:00:00 2001
From fbc8819e3a23876e68abe0c2d8e225a8d1ea2657 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 12:56:02 +1000
Subject: [PATCH] Better Chunk Tick Selection
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index cd529ec..53ab411 100644
index 5f12d2e..069db6a 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -62,7 +62,7 @@ public abstract class World implements IBlockAccess {
@@ -61,7 +61,7 @@ public abstract class World implements IBlockAccess {
public Scoreboard scoreboard = new Scoreboard(); // CraftBukkit - protected -> public
public boolean isStatic;
// CraftBukkit start - public, longhashset
@ -60,7 +60,7 @@ index cd529ec..53ab411 100644
this.L = this.random.nextInt(12000);
this.allowMonsters = true;
@@ -1903,24 +1932,44 @@ public abstract class World implements IBlockAccess {
@@ -1913,24 +1942,44 @@ public abstract class World implements IBlockAccess {
int j;
int k;
@ -185,5 +185,5 @@ index 961ddb4..6ba7f5c 100644
+ }
}
--
1.8.3.2
1.8.4.msysgit.0

14
CraftBukkit-Patches/0010-Async-Operation-Catching.patch
View File

@ -1,4 +1,4 @@
From 896de729f459ebbc7cfc3884e8d8de4ce2fb587e Mon Sep 17 00:00:00 2001
From 6becf979e8c6efa451679528a63a9416a44ac337 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 7 Mar 2013 20:12:46 +1100
Subject: [PATCH] Async Operation Catching
@ -66,7 +66,7 @@ index 9f818cf..8052ea6 100644
this.trackedPlayers.remove(entityplayer);
entityplayer.removeQueue.add(Integer.valueOf(this.tracker.getId()));
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index d90d5a4..1381660 100644
index 164d268..e26ba96 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -903,6 +903,7 @@ public abstract class World implements IBlockAccess {
@ -85,7 +85,7 @@ index d90d5a4..1381660 100644
entity.die();
if (entity instanceof EntityHuman) {
this.players.remove(entity);
@@ -2378,6 +2380,7 @@ public abstract class World implements IBlockAccess {
@@ -2388,6 +2390,7 @@ public abstract class World implements IBlockAccess {
}
public void a(List list) {
@ -94,7 +94,7 @@ index d90d5a4..1381660 100644
// this.entityList.addAll(list);
Entity entity = null;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index c16413a..468a4e1 100644
index 965d860..57dd4e7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -159,6 +159,7 @@ public class CraftWorld implements World {
@ -122,10 +122,10 @@ index c16413a..468a4e1 100644
if (generate) {
// Use the default variant of loadChunk when generate == true.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 6b7fcfc..2542d56 100644
index 573f9a5..bf3c9db 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -230,6 +230,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -231,6 +231,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void kickPlayer(String message) {
@ -146,5 +146,5 @@ index 84091a4..2f30d66 100644
scoreboards.add(scoreboard);
return scoreboard;
--
1.8.3.2
1.8.4.msysgit.0

44
CraftBukkit-Patches/0014-Improved-Timings-System.patch
View File

@ -1,4 +1,4 @@
From 9aa2c9cab36f62efe112ad012cd715aeedfb4609 Mon Sep 17 00:00:00 2001
From 6e61672fd09bf2cd90e4d3a7cd3f185dddd64b09 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Improved Timings System
@ -6,25 +6,25 @@ Subject: [PATCH] Improved Timings System
Tracks nearly every point of minecraft internals and plugin events to give a good quick overview on what is causing TPS loss.
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 9c99177..b88f75c 100644
index bf60f4e..9ccc057 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -106,6 +106,7 @@ public class ChunkProviderServer implements IChunkProvider {
// CraftBukkit end
@@ -124,6 +124,7 @@ public class ChunkProviderServer implements IChunkProvider {
boolean newChunk = false;
if (chunk == null) {
+ org.bukkit.craftbukkit.SpigotTimings.syncChunkLoadTimer.startTiming(); // Spigot
chunk = this.loadChunk(i, j);
if (chunk == null) {
if (this.chunkProvider == null) {
@@ -141,6 +142,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -159,6 +160,7 @@ public class ChunkProviderServer implements IChunkProvider {
}
// CraftBukkit end
chunk.a(this, this, i, j);
+ org.bukkit.craftbukkit.SpigotTimings.syncChunkLoadTimer.stopTiming(); // Spigot
}
// CraftBukkit start - If we didn't need to load the chunk run the callback now
return chunk;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index f74d937..ff07aa7 100644
--- a/src/main/java/net/minecraft/server/Entity.java
@ -146,10 +146,10 @@ index 6a01982..2519af6 100644
public boolean getAllowNether() {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index ee6b0a1..d9e64a3 100644
index 3e8517c..333a23f 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -917,6 +917,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -937,6 +937,7 @@ public class PlayerConnection implements PacketPlayInListener {
// CraftBukkit end
private void handleCommand(String s) {
@ -157,7 +157,7 @@ index ee6b0a1..d9e64a3 100644
// CraftBukkit start
CraftPlayer player = this.getPlayer();
@@ -924,19 +925,23 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -944,19 +945,23 @@ public class PlayerConnection implements PacketPlayInListener {
this.server.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@ -199,7 +199,7 @@ index 811f1a4..3de32fe 100644
private static Map i = new HashMap();
private static Map j = new HashMap();
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 00c2a18..f1bf467 100644
index 3d7aa71..e64658d 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -14,6 +14,7 @@ import java.util.concurrent.Callable;
@ -207,9 +207,9 @@ index 00c2a18..f1bf467 100644
import org.bukkit.craftbukkit.util.CraftMagicNumbers;
import org.bukkit.craftbukkit.util.LongHashSet;
+import org.bukkit.craftbukkit.SpigotTimings; // Spigot
import org.bukkit.craftbukkit.util.UnsafeList;
import org.bukkit.generator.ChunkGenerator;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
@@ -133,6 +134,8 @@ public abstract class World implements IBlockAccess {
final Object chunkLock = new Object();
public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
@ -227,15 +227,15 @@ index 00c2a18..f1bf467 100644
}
protected abstract IChunkProvider j();
@@ -1230,6 +1234,7 @@ public abstract class World implements IBlockAccess {
@@ -1239,6 +1243,7 @@ public abstract class World implements IBlockAccess {
this.f.clear();
this.methodProfiler.c("regular");
+ timings.entityTick.startTiming(); // Spigot
for (i = 0; i < this.entityList.size(); ++i) {
entity = (Entity) this.entityList.get(i);
@@ -1252,7 +1257,9 @@ public abstract class World implements IBlockAccess {
// CraftBukkit start - Use field for loop variable
for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) {
entity = (Entity) this.entityList.get(this.tickPosition);
@@ -1262,7 +1267,9 @@ public abstract class World implements IBlockAccess {
this.methodProfiler.a("tick");
if (!entity.dead) {
try {
@ -245,7 +245,7 @@ index 00c2a18..f1bf467 100644
} catch (Throwable throwable1) {
crashreport = CrashReport.a(throwable1, "Ticking entity");
crashreportsystemdetails = crashreport.a("Entity being ticked");
@@ -1277,7 +1284,9 @@ public abstract class World implements IBlockAccess {
@@ -1287,7 +1294,9 @@ public abstract class World implements IBlockAccess {
this.methodProfiler.b();
}
@ -255,7 +255,7 @@ index 00c2a18..f1bf467 100644
this.N = true;
Iterator iterator = this.tileEntityList.iterator();
@@ -1292,8 +1301,11 @@ public abstract class World implements IBlockAccess {
@@ -1302,8 +1311,11 @@ public abstract class World implements IBlockAccess {
if (!tileentity.r() && tileentity.o() && this.isLoaded(tileentity.x, tileentity.y, tileentity.z)) {
try {
@ -267,7 +267,7 @@ index 00c2a18..f1bf467 100644
crashreport = CrashReport.a(throwable2, "Ticking block entity");
crashreportsystemdetails = crashreport.a("Block entity being ticked");
tileentity.a(crashreportsystemdetails);
@@ -1313,6 +1325,8 @@ public abstract class World implements IBlockAccess {
@@ -1323,6 +1335,8 @@ public abstract class World implements IBlockAccess {
}
}
@ -276,7 +276,7 @@ index 00c2a18..f1bf467 100644
this.N = false;
if (!this.b.isEmpty()) {
this.tileEntityList.removeAll(this.b);
@@ -1351,6 +1365,7 @@ public abstract class World implements IBlockAccess {
@@ -1361,6 +1375,7 @@ public abstract class World implements IBlockAccess {
this.a.clear();
}
@ -284,7 +284,7 @@ index 00c2a18..f1bf467 100644
this.methodProfiler.b();
this.methodProfiler.b();
}
@@ -1373,6 +1388,7 @@ public abstract class World implements IBlockAccess {
@@ -1383,6 +1398,7 @@ public abstract class World implements IBlockAccess {
byte b0 = 32;
if (!flag || this.b(i - b0, 0, j - b0, i + b0, 0, j + b0)) {
@ -292,7 +292,7 @@ index 00c2a18..f1bf467 100644
entity.T = entity.locX;
entity.U = entity.locY;
entity.V = entity.locZ;
@@ -1434,6 +1450,7 @@ public abstract class World implements IBlockAccess {
@@ -1444,6 +1460,7 @@ public abstract class World implements IBlockAccess {
entity.passenger = null;
}
}

8
CraftBukkit-Patches/0016-Handle-Null-Tile-Entities.patch
View File

@ -1,14 +1,14 @@
From 1a7e92b8f083d819750ddabb094a5f6d16cdd77a Mon Sep 17 00:00:00 2001
From f4eb04cc282a3a666f4e86bf088ba98aa0597eca Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 3 Feb 2013 09:20:19 +1100
Subject: [PATCH] Handle Null Tile Entities
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index f1bf467..5a368a0 100644
index e64658d..99345a1 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1292,6 +1292,13 @@ public abstract class World implements IBlockAccess {
@@ -1302,6 +1302,13 @@ public abstract class World implements IBlockAccess {
while (iterator.hasNext()) {
TileEntity tileentity = (TileEntity) iterator.next();
@ -23,5 +23,5 @@ index f1bf467..5a368a0 100644
ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
if (chunkProviderServer.unloadQueue.contains(tileentity.x >> 4, tileentity.z >> 4)) {
--
1.8.3.2
1.8.4.msysgit.0

12
CraftBukkit-Patches/0017-Entity-Activation-Range.patch
View File

@ -1,4 +1,4 @@
From bcd783b672729f05034d1e8f380d05b99cb27ac2 Mon Sep 17 00:00:00 2001
From 77e202f4ea13d8ed1ce371a310ed4c6ca8ad6bb0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 3 Feb 2013 05:10:21 -0500
Subject: [PATCH] Entity Activation Range
@ -116,18 +116,18 @@ index 7211da8..d06ec7b 100644
public EntityLiving(World world) {
super(world);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 5a368a0..2cc9005 100644
index 99345a1..58eacd2 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1234,6 +1234,7 @@ public abstract class World implements IBlockAccess {
@@ -1243,6 +1243,7 @@ public abstract class World implements IBlockAccess {
this.f.clear();
this.methodProfiler.c("regular");
+ org.spigotmc.ActivationRange.activateEntities(this); // Spigot
timings.entityTick.startTiming(); // Spigot
for (i = 0; i < this.entityList.size(); ++i) {
entity = (Entity) this.entityList.get(i);
@@ -1394,7 +1395,11 @@ public abstract class World implements IBlockAccess {
// CraftBukkit start - Use field for loop variable
for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) {
@@ -1404,7 +1405,11 @@ public abstract class World implements IBlockAccess {
int j = MathHelper.floor(entity.locZ);
byte b0 = 32;

8
CraftBukkit-Patches/0024-Enable-Improved-Ping-Sending.patch
View File

@ -1,4 +1,4 @@
From d734e106f3f2185a88917e49ac96e4babe7ac606 Mon Sep 17 00:00:00 2001
From 9423d32845eb0479a9049335fb2157dcbf4a6210 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 24 Feb 2013 20:45:20 +1100
Subject: [PATCH] Enable Improved Ping Sending
@ -17,10 +17,10 @@ index 1dee8b2..4945955 100644
public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 534073b..07cee4d 100644
index 4383275..fa3e65c 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -765,6 +765,25 @@ public abstract class PlayerList {
@@ -775,6 +775,25 @@ public abstract class PlayerList {
this.sendAll(new PacketPlayOutPlayerInfo(entityplayer.getName(), true, entityplayer.ping));
}
// CraftBukkit end */
@ -47,5 +47,5 @@ index 534073b..07cee4d 100644
public void sendAll(Packet packet) {
--
1.8.3.2
1.8.4.msysgit.0

8
CraftBukkit-Patches/0026-Close-Unloaded-Save-Files.patch
View File

@ -1,4 +1,4 @@
From c35c4a094e30b6ef218081eae54e0250376ec141 Mon Sep 17 00:00:00 2001
From 0682f59ec48b7d41a006eaa45c87a34fc93b12a4 Mon Sep 17 00:00:00 2001
From: Antony Riley <antony@cyberiantiger.org>
Date: Wed, 27 Mar 2013 01:41:54 +0200
Subject: [PATCH] Close Unloaded Save Files
@ -18,10 +18,10 @@ index 900ed68..829f4a3 100644
public static synchronized RegionFile a(File file1, int i, int j) {
File file2 = new File(file1, "region");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d5c1ffb..dd02f8b 100644
index 4d46178..2d46aca 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -41,6 +41,8 @@ import net.minecraft.server.MinecraftServer;
@@ -83,6 +83,8 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.server.MobEffectList;
import net.minecraft.server.PropertyManager;
import net.minecraft.server.ServerCommand;
@ -30,7 +30,7 @@ index d5c1ffb..dd02f8b 100644
import net.minecraft.server.ServerNBTManager;
import net.minecraft.server.WorldLoaderServer;
import net.minecraft.server.WorldManager;
@@ -850,6 +852,30 @@ public final class CraftServer implements Server {
@@ -993,6 +995,30 @@ public final class CraftServer implements Server {
worlds.remove(world.getName().toLowerCase());
console.worlds.remove(console.worlds.indexOf(handle));

8
CraftBukkit-Patches/0031-Prevent-Shutdown-Hang.patch
View File

@ -1,4 +1,4 @@
From 182aaa84bf197b9a61ec3a79033457788c4f1188 Mon Sep 17 00:00:00 2001
From 4bf71722086d0436e249d4bd1db5fb205860a99f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 11:54:32 +1000
Subject: [PATCH] Prevent Shutdown Hang
@ -6,10 +6,10 @@ Subject: [PATCH] Prevent Shutdown Hang
Prevents server hanging if players disconnect during the shutdown sequence.
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 07cee4d..1725bba 100644
index fa3e65c..b6a3d2b 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1115,8 +1115,15 @@ public abstract class PlayerList {
@@ -1125,8 +1125,15 @@ public abstract class PlayerList {
}
public void r() {
@ -28,5 +28,5 @@ index 07cee4d..1725bba 100644
}
--
1.8.3.2
1.8.4.msysgit.0

6
CraftBukkit-Patches/0034-Do-Not-Search-for-Offline-Players.patch
View File

@ -1,4 +1,4 @@
From 827a1584998eff24da02f7369d56ed9b7cd1e5fe Mon Sep 17 00:00:00 2001
From 3b83e492c658d49603312c630335769cfc5fd5f4 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 16 Jun 2013 08:20:26 +1000
Subject: [PATCH] Do Not Search for Offline Players
@ -6,10 +6,10 @@ Subject: [PATCH] Do Not Search for Offline Players
By default we do not want to search as this leads to massive load times for plugins wanting to do mass data lookups.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index dd02f8b..1792828 100644
index 2d46aca..c3e6f82 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1134,7 +1134,7 @@ public final class CraftServer implements Server {
@@ -1277,7 +1277,7 @@ public final class CraftServer implements Server {
}
public OfflinePlayer getOfflinePlayer(String name) {

8
CraftBukkit-Patches/0035-Allow-Disabling-of-Command-Logging.patch
View File

@ -1,14 +1,14 @@
From 0a8589407c0e09791756ec92ddc0d6cb81084a9a Mon Sep 17 00:00:00 2001
From f05c8b683f86064c210af98667e2450558c768cd Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:01:29 +1000
Subject: [PATCH] Allow Disabling of Command Logging
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index d0ea17a..31be464 100644
index 333a23f..b281201 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -930,7 +930,12 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -950,7 +950,12 @@ public class PlayerConnection implements PacketPlayInListener {
}
try {
@ -38,5 +38,5 @@ index 9aaa09a..4d15f8b 100644
+ }
}
--
1.8.3.2
1.8.4.msysgit.0

6
CraftBukkit-Patches/0036-Allow-Disabling-of-Command-TabComplete.patch
View File

@ -1,14 +1,14 @@
From 47b68c9e9aedc25df26b5e225026027de32075a2 Mon Sep 17 00:00:00 2001
From a5a90003a05ff5e0c9bd9dae34573a41eee96394 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:05:54 +1000
Subject: [PATCH] Allow Disabling of Command TabComplete
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1792828..141de1e 100644
index c3e6f82..a48fbe9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1399,6 +1399,13 @@ public final class CraftServer implements Server {
@@ -1554,6 +1554,13 @@ public final class CraftServer implements Server {
}
public List<String> tabCompleteCommand(Player player, String message) {

10
CraftBukkit-Patches/0037-Configurable-Messages.patch
View File

@ -1,11 +1,11 @@
From 8a2ee852f09290306e43b9fcb8bfd3bef006e429 Mon Sep 17 00:00:00 2001
From c050f22c6fca20680f43cb66f90efffc00bebd3b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 19:21:58 +1000
Subject: [PATCH] Configurable Messages
diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
index a02c83f..9533fd1 100644
index 54ecbdf..ff7b3d3 100644
--- a/src/main/java/net/minecraft/server/HandshakeListener.java
+++ b/src/main/java/net/minecraft/server/HandshakeListener.java
@@ -64,11 +64,11 @@ public class HandshakeListener implements PacketHandshakingInListener {
@ -23,7 +23,7 @@ index a02c83f..9533fd1 100644
this.b.a((IChatBaseComponent) chatcomponenttext);
} else {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 1725bba..5174602 100644
index b6a3d2b..9d116e5 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -335,7 +335,7 @@ public abstract class PlayerList {
@ -45,10 +45,10 @@ index 1725bba..5174602 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 141de1e..89fb069 100644
index a48fbe9..b9a72d8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -548,11 +548,7 @@ public final class CraftServer implements Server {
@@ -688,11 +688,7 @@ public final class CraftServer implements Server {
return true;
}

8
CraftBukkit-Patches/0038-Allow-Disabling-of-Random-Lighting-Updates.patch
View File

@ -1,4 +1,4 @@
From 28ebc911a44f4da8ade44040fc9a8b652c767259 Mon Sep 17 00:00:00 2001
From 774ed3fecda98d3dedd42b5116461eb47ecae721 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 22 Jun 2013 16:12:02 +1000
Subject: [PATCH] Allow Disabling of Random Lighting Updates
@ -18,10 +18,10 @@ index 10efeef..2fd6a43 100644
}
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 2cc9005..0b6b681 100644
index 58eacd2..0eeed14 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2024,7 +2024,7 @@ public abstract class World implements IBlockAccess {
@@ -2034,7 +2034,7 @@ public abstract class World implements IBlockAccess {
}
this.methodProfiler.a("playerCheckLight");
@ -47,5 +47,5 @@ index 87eac1b..aa639fe 100644
+ }
}
--
1.8.3.2
1.8.4.msysgit.0

8
CraftBukkit-Patches/0041-Disallow-Interaction-With-Self.patch
View File

@ -1,14 +1,14 @@
From d206e513d6dcf5b1cd4278d5fb2742915385bc41 Mon Sep 17 00:00:00 2001
From 26013a2fda72d27a2a23707b8146d0a0ccb87ab6 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 28 Jun 2013 19:52:54 +1000
Subject: [PATCH] Disallow Interaction With Self
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 08cf293..018127b 100644
index b281201..e9652a5 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1037,6 +1037,13 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -1057,6 +1057,13 @@ public class PlayerConnection implements PacketPlayInListener {
if (this.player.dead) return; // CraftBukkit
WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
Entity entity = packetplayinuseentity.a((World) worldserver);
@ -23,5 +23,5 @@ index 08cf293..018127b 100644
this.player.w();
if (entity != null) {
--
1.8.3.2
1.8.4.msysgit.0

16
CraftBukkit-Patches/0045-Entity-ticking-chunk-caching.patch
View File

@ -1,4 +1,4 @@
From 4702a15a24589d356c8672427ddd07713d060f11 Mon Sep 17 00:00:00 2001
From 705f008f7e07131dba5f94e2002fb49be167a485 Mon Sep 17 00:00:00 2001
From: Ammar Askar <ammar@ammaraskar.com>
Date: Tue, 16 Jul 2013 03:32:32 +0500
Subject: [PATCH] Entity ticking chunk caching
@ -6,10 +6,10 @@ Subject: [PATCH] Entity ticking chunk caching
Cache known loaded chunks so we avoid making a potentially expensive contains call for every single entity in exchange for some simple arithmetic. Best case scenario, this cuts down contains call to once per chunk, worst case it adds on some simple arithmetic operations
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 0b6b681..13ca7fa 100644
index 0eeed14..5fb3fbf 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1179,6 +1179,7 @@ public abstract class World implements IBlockAccess {
@@ -1188,6 +1188,7 @@ public abstract class World implements IBlockAccess {
CrashReport crashreport;
CrashReportSystemDetails crashreportsystemdetails;
@ -17,7 +17,7 @@ index 0b6b681..13ca7fa 100644
for (i = 0; i < this.i.size(); ++i) {
entity = (Entity) this.i.get(i);
// CraftBukkit start - Fixed an NPE, don't process entities in chunks queued for unload
@@ -1187,10 +1188,15 @@ public abstract class World implements IBlockAccess {
@@ -1196,10 +1197,15 @@ public abstract class World implements IBlockAccess {
}
ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
@ -35,7 +35,7 @@ index 0b6b681..13ca7fa 100644
try {
++entity.ticksLived;
@@ -1211,6 +1217,7 @@ public abstract class World implements IBlockAccess {
@@ -1220,6 +1226,7 @@ public abstract class World implements IBlockAccess {
this.i.remove(i--);
}
}
@ -43,9 +43,9 @@ index 0b6b681..13ca7fa 100644
this.methodProfiler.c("remove");
this.entityList.removeAll(this.f);
@@ -1241,10 +1248,15 @@ public abstract class World implements IBlockAccess {
@@ -1251,10 +1258,15 @@ public abstract class World implements IBlockAccess {
// CraftBukkit start - Don't tick entities in chunks queued for unload
// Don't tick entities in chunks queued for unload
ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
- if (chunkProviderServer.unloadQueue.contains(MathHelper.floor(entity.locX) >> 4, MathHelper.floor(entity.locZ) >> 4)) {
- continue;
@ -62,5 +62,5 @@ index 0b6b681..13ca7fa 100644
if (entity.vehicle != null) {
if (!entity.vehicle.dead && entity.vehicle.passenger == entity) {
--
1.8.3.2
1.8.4.msysgit.0

8
CraftBukkit-Patches/0047-Player-Collision-API.patch
View File

@ -1,4 +1,4 @@
From eb38a6812659dd0856232d86bd09699ee79f3298 Mon Sep 17 00:00:00 2001
From dcba3bd4d498eca5b5833f67dc38eef0e87dbd12 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:27:07 +1000
Subject: [PATCH] Player Collision API
@ -57,10 +57,10 @@ index 4945955..ab39926 100644
public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
super(worldserver, gameprofile);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 2542d56..eaffcdc 100644
index bf3c9db..afbc3d8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1259,6 +1259,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1257,6 +1257,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Spigot start
private final Player.Spigot spigot = new Player.Spigot()
{
@ -81,5 +81,5 @@ index 2542d56..eaffcdc 100644
public Player.Spigot spigot()
--
1.8.3.2
1.8.4.msysgit.0

33
CraftBukkit-Patches/0050-Guard-entity-list.patch
View File

@ -1,14 +1,14 @@
From e241a4fff80fdf576671bca124cb61fd53b28630 Mon Sep 17 00:00:00 2001
From 38c40e66efdfe76a60e5c1e508dc21bae94b4733 Mon Sep 17 00:00:00 2001
From: Ammar Askar <ammar@ammaraskar.com>
Date: Sat, 3 Aug 2013 21:42:00 +0500
Subject: [PATCH] Guard entity list
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 13ca7fa..5b0875d 100644
index 5fb3fbf..0923296 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -30,7 +30,25 @@ import org.bukkit.event.weather.ThunderChangeEvent;
@@ -29,7 +29,25 @@ import org.bukkit.event.weather.ThunderChangeEvent;
public abstract class World implements IBlockAccess {
public boolean d;
@ -43,20 +43,33 @@ index 13ca7fa..5b0875d 100644
protected final gnu.trove.map.hash.TLongShortHashMap chunkTickList;
protected float growthOdds = 100;
protected float modifiedOdds = 100;
@@ -1243,6 +1262,7 @@ public abstract class World implements IBlockAccess {
@@ -1032,7 +1051,12 @@ public abstract class World implements IBlockAccess {
if (index <= this.tickPosition) {
this.tickPosition--;
}
+ // Spigot start
+ boolean isGuarding = guardEntityList;
+ guardEntityList = false;
this.entityList.remove(index);
+ guardEntityList = isGuarding;
+ // Spigot end
}
// CraftBukkit end
@@ -1252,6 +1276,7 @@ public abstract class World implements IBlockAccess {
org.spigotmc.ActivationRange.activateEntities(this); // Spigot
timings.entityTick.startTiming(); // Spigot
+ guardEntityList = true; // Spigot
for (i = 0; i < this.entityList.size(); ++i) {
entity = (Entity) this.entityList.get(i);
@@ -1290,12 +1310,15 @@ public abstract class World implements IBlockAccess {
// CraftBukkit start - Use field for loop variable
for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) {
entity = (Entity) this.entityList.get(this.tickPosition);
@@ -1300,12 +1325,15 @@ public abstract class World implements IBlockAccess {
this.getChunkAt(j, k).b(entity);
}
+ guardEntityList = false; // Spigot
this.entityList.remove(i--);
this.entityList.remove(this.tickPosition--); // CraftBukkit - Use field for loop variable
+ guardEntityList = true; // Spigot
this.b(entity);
}
@ -68,5 +81,5 @@ index 13ca7fa..5b0875d 100644
timings.entityTick.stopTiming(); // Spigot
this.methodProfiler.c("blockEntities");
--
1.8.3.2
1.8.4.msysgit.0

10
CraftBukkit-Patches/0051-Cap-Minimum-Player-Speed.patch
View File

@ -1,14 +1,14 @@
From 24774bf49301649fabd823225cf86b7256429aa3 Mon Sep 17 00:00:00 2001
From 8407525d0a9e0efb1230c43265b094680677cac4 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 5 Aug 2013 20:17:20 +1000
Subject: [PATCH] Cap Minimum Player Speed
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index eaffcdc..22fc18f 100644
index afbc3d8..2a13ab2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1131,7 +1131,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1129,7 +1129,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setFlySpeed(float value) {
validateSpeed(value);
EntityPlayer player = getHandle();
@ -17,7 +17,7 @@ index eaffcdc..22fc18f 100644
player.updateAbilities();
}
@@ -1139,7 +1139,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1137,7 +1137,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setWalkSpeed(float value) {
validateSpeed(value);
EntityPlayer player = getHandle();
@ -27,5 +27,5 @@ index eaffcdc..22fc18f 100644
}
--
1.8.3.2
1.8.4.msysgit.0

8
CraftBukkit-Patches/0057-Implement-respawn-API.patch
View File

@ -1,14 +1,14 @@
From 5525c79dcc3eaf26c4b4785eca9bdc14ff6c38ad Mon Sep 17 00:00:00 2001
From c6b2a59a9e9e424ab2e9a61ebbb2bd2779a29e23 Mon Sep 17 00:00:00 2001
From: ninja- <xninja@openmailbox.org>
Date: Tue, 8 Oct 2013 14:34:49 +0200
Subject: [PATCH] Implement respawn API.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 22fc18f..f8e43d1 100644
index 2a13ab2..1b902b2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1272,6 +1272,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1270,6 +1270,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().collidesWithEntities = collides;
getHandle().l = collides; // First boolean of Entity
}
@ -25,5 +25,5 @@ index 22fc18f..f8e43d1 100644
public Player.Spigot spigot()
--
1.8.3.2
1.8.4.msysgit.0

8
CraftBukkit-Patches/0062-BungeeCord-Support.patch
View File

@ -1,4 +1,4 @@
From 8ee5fd0371c74a972cf943018b8995dd650530ae Mon Sep 17 00:00:00 2001
From 15c5a59473436856080f7fa581726e9c53666a4a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 18:18:41 +1100
Subject: [PATCH] BungeeCord Support
@ -6,7 +6,7 @@ Subject: [PATCH] BungeeCord Support
Provides support for IP forwarding via BungeeCord.
diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
index 9533fd1..6098eb5 100644
index ff7b3d3..a517306 100644
--- a/src/main/java/net/minecraft/server/HandshakeListener.java
+++ b/src/main/java/net/minecraft/server/HandshakeListener.java
@@ -73,6 +73,19 @@ public class HandshakeListener implements PacketHandshakingInListener {
@ -82,10 +82,10 @@ index 8f829bb..6b2fbb9 100644
+ // Spigot End
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f8e43d1..7eb95e2 100644
index 1b902b2..a85b08e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1261,6 +1261,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1259,6 +1259,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
{
@Override

10
CraftBukkit-Patches/0066-Allow-Teleportation-of-Vehicles-and-Passengers.patch
View File

@ -1,14 +1,14 @@
From 5c69c193f3ea57e986c6c66e306b62b41721448d Mon Sep 17 00:00:00 2001
From 6cf9098868312d0b36d20b135d228292e9fa7ced Mon Sep 17 00:00:00 2001
From: ItsHarry <info@itsjerryandharry.com>
Date: Thu, 5 Dec 2013 21:58:11 +0100
Subject: [PATCH] Allow Teleportation of Vehicles and Passengers
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3c17e2f..4fa4142 100644
index a85b08e..5fe8276 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -430,9 +430,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -431,9 +431,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return false;
}
@ -23,7 +23,7 @@ index 3c17e2f..4fa4142 100644
// From = Players current Location
Location from = this.getLocation();
@@ -446,6 +448,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -447,6 +449,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (event.isCancelled()) {
return false;
}
@ -36,5 +36,5 @@ index 3c17e2f..4fa4142 100644
// Update the From Location
from = event.getFrom();
--
1.8.3.2
1.8.4.msysgit.0

8
CraftBukkit-Patches/0067-Remove-OS-X-Special-Chars-from-Signs.patch
View File

@ -1,14 +1,14 @@
From 48e13501d3e0d30e4bcc0a875894254e87f5029b Mon Sep 17 00:00:00 2001
From 054f1855d4ff3344c64b9e7d53b2ca6b46637a95 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 8 Dec 2013 16:52:42 +1100
Subject: [PATCH] Remove OS X Special Chars from Signs
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 733b9d3..a462492 100644
index 0fa731e..c9585fc 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1552,6 +1552,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -1572,6 +1572,7 @@ public class PlayerConnection implements PacketPlayInListener {
for (j = 0; j < 4; ++j) {
boolean flag = true;
@ -17,5 +17,5 @@ index 733b9d3..a462492 100644
if (packetplayinupdatesign.f()[j].length() > 15) {
flag = false;
--
1.8.3.2
1.8.4.msysgit.0

322
CraftBukkit-Patches/0073-Add-VanillaCommand-Wrapper-to-Support-New-Commands.patch
View File

@ -1,322 +0,0 @@
From 42df6ba4080ca38d5f94a1a44d5f25b23044d70f Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 18 Dec 2013 10:32:15 +1100
Subject: [PATCH] Add VanillaCommand Wrapper to Support New Commands
This implements testfor, setblock and summon, as well as the capacity to replace any command with its vanilla version.
diff --git a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
index 5271272..f8d2ecb 100644
--- a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
+++ b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
@@ -96,7 +96,7 @@ public abstract class CommandBlockListenerAbstract implements ICommandListener {
// Make sure this is a valid command
if (commandMap.getCommand(args[0]) == null) {
- this.b = 0;
+ this.b = org.spigotmc.VanillaCommandWrapper.dispatch( sender, command ); // Spigot - Try vanilla commands
return;
}
diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
index e63f17c..e58be15 100644
--- a/src/main/java/net/minecraft/server/CommandDispatcher.java
+++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
@@ -62,7 +62,7 @@ public class CommandDispatcher extends CommandHandler implements ICommandDispatc
public void a(ICommandListener icommandlistener, int i, String s, Object... aobject) {
boolean flag = true;
- if (icommandlistener instanceof CommandBlockListenerAbstract && !MinecraftServer.getServer().worldServer[0].getGameRules().getBoolean("commandBlockOutput")) {
+ if (icommandlistener instanceof CommandBlockListenerAbstract && !MinecraftServer.getServer().worlds.get(0).getGameRules().getBoolean("commandBlockOutput")) { // Spigot - worldServer -> worlds
flag = false;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 89fb069..b482592 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -547,6 +547,12 @@ public final class CraftServer implements Server {
if (commandMap.dispatch(sender, commandLine)) {
return true;
}
+ // Spigot Start - Try vanilla commands
+ if ( org.spigotmc.VanillaCommandWrapper.dispatch( sender, commandLine ) != -1 )
+ {
+ return true;
+ }
+ // Spigot End
sender.sendMessage(org.spigotmc.SpigotConfig.unknownCommandMessage);
@@ -1402,15 +1408,27 @@ public final class CraftServer implements Server {
}
// Spigot End
- List<String> completions = null;
+ // Spigot Start
+ List<String> completions = new ArrayList<String>();
try {
- completions = getCommandMap().tabComplete(player, message.substring(1));
+ message = message.substring( 1 );
+ List<String> bukkitCompletions = getCommandMap().tabComplete( player, message );
+ if ( bukkitCompletions != null )
+ {
+ completions.addAll( bukkitCompletions );
+ }
+ List<String> vanillaCompletions = org.spigotmc.VanillaCommandWrapper.complete( player, message );
+ if ( vanillaCompletions != null )
+ {
+ completions.addAll( vanillaCompletions );
+ }
+ // Spigot End
} catch (CommandException ex) {
player.sendMessage(ChatColor.RED + "An internal error occurred while attempting to tab-complete this command");
getLogger().log(Level.SEVERE, "Exception when " + player.getName() + " attempted to tab complete " + message, ex);
}
- return completions == null ? ImmutableList.<String>of() : completions;
+ return completions; // Spigot
}
public List<String> tabCompleteChat(Player player, String message) {
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index cfddd28..ca2e054 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -6,6 +6,7 @@ import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -14,6 +15,7 @@ import net.minecraft.server.MinecraftServer;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
+import org.bukkit.command.SimpleCommandMap;
import org.bukkit.configuration.file.YamlConfiguration;
public class SpigotConfig
@@ -198,4 +200,17 @@ public class SpigotConfig
System.setProperty( "io.netty.eventLoopThreads", Integer.toString( count ) );
Bukkit.getLogger().log( Level.INFO, "Using {0} threads for Netty based IO", count );
}
+
+ private static void replaceCommands()
+ {
+ if ( config.contains( "replace-commands" ) ) {
+ set( "commands.replace-commands", config.getStringList( "replace-commands" ) );
+ config.set( "replace-commands", null );
+ }
+ for ( String command : (List<String>) getList( "commands.replace-commands", Arrays.asList( "setblock", "summon", "testforblock", "tellraw" ) ) )
+ {
+ SimpleCommandMap.removeFallback( command );
+ VanillaCommandWrapper.allowedCommands.add( command );
+ }
+ }
}
diff --git a/src/main/java/org/spigotmc/VanillaCommandWrapper.java b/src/main/java/org/spigotmc/VanillaCommandWrapper.java
new file mode 100644
index 0000000..a6c76cc
--- /dev/null
+++ b/src/main/java/org/spigotmc/VanillaCommandWrapper.java
@@ -0,0 +1,194 @@
+package org.spigotmc;
+
+import com.google.common.collect.ImmutableList;
+import net.minecraft.server.ChatComponentText;
+import net.minecraft.server.ChunkCoordinates;
+import net.minecraft.server.EntityMinecartCommandBlock;
+import net.minecraft.server.IChatBaseComponent;
+import net.minecraft.server.ICommandListener;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.TileEntityCommand;
+import net.minecraft.server.World;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.block.Block;
+import org.bukkit.command.CommandSender;
+import org.bukkit.craftbukkit.CraftWorld;
+import org.bukkit.craftbukkit.command.CraftBlockCommandSender;
+import org.bukkit.craftbukkit.entity.CraftMinecartCommand;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+
+public class VanillaCommandWrapper
+{
+
+ public static final HashSet<String> allowedCommands = new HashSet<String>();
+
+ public static int dispatch(CommandSender sender, String commandLine)
+ {
+ int pos = commandLine.indexOf( ' ' );
+ if ( pos == -1 )
+ {
+ pos = commandLine.length();
+ }
+ String name = commandLine.substring( 0, pos );
+ if ( !allowedCommands.contains( name ) )
+ {
+ return -1;
+ }
+ if ( !sender.hasPermission( "bukkit.command." + name ) )
+ {
+ sender.sendMessage( ChatColor.RED + "You do not have permission for this command" );
+ return 0;
+ }
+ ICommandListener listener = getListener( sender );
+ if ( listener == null )
+ {
+ return -1;
+ }
+ return MinecraftServer.getServer().getCommandHandler().a( listener, commandLine );
+ }
+
+ public static List<String> complete(CommandSender sender, String commandLine)
+ {
+ int pos = commandLine.indexOf( ' ' );
+ if ( pos == -1 )
+ {
+ List<String> completions = new ArrayList<String>();
+ commandLine = commandLine.toLowerCase();
+ for ( String command : allowedCommands )
+ {
+ if ( command.startsWith( commandLine ) && sender.hasPermission( "bukkit.command." + command ) )
+ {
+ completions.add( "/" + command );
+ }
+ }
+ return completions;
+ }
+ String name = commandLine.substring( 0, pos );
+ if ( !allowedCommands.contains( name ) || !sender.hasPermission( "bukkit.command." + name ) )
+ {
+ return ImmutableList.<String>of();
+ }
+ ICommandListener listener = getListener( sender );
+ if ( listener == null )
+ {
+ return ImmutableList.<String>of();
+ }
+ return MinecraftServer.getServer().getCommandHandler().b( listener, commandLine );
+ }
+
+ private static ICommandListener getListener(CommandSender sender)
+ {
+ if ( sender instanceof CraftPlayer )
+ {
+ return new PlayerListener( ( (CraftPlayer) sender ).getHandle() );
+ }
+ if ( sender instanceof CraftBlockCommandSender )
+ {
+ CraftBlockCommandSender commandBlock = (CraftBlockCommandSender) sender;
+ Block block = commandBlock.getBlock();
+ return ( (TileEntityCommand) ( (CraftWorld) block.getWorld() ).getTileEntityAt( block.getX(), block.getY(), block.getZ() ) ).a();
+ }
+ if ( sender instanceof CraftMinecartCommand )
+ {
+ return ( (EntityMinecartCommandBlock) ( (CraftMinecartCommand) sender ).getHandle() ).e();
+ }
+ return new ConsoleListener(sender); // Assume console/rcon
+ }
+
+ private static class PlayerListener implements ICommandListener
+ {
+
+ private final ICommandListener handle;
+
+ public PlayerListener(ICommandListener handle)
+ {
+ this.handle = handle;
+ }
+
+ @Override
+ public String getName()
+ {
+ return handle.getName();
+ }
+
+ @Override
+ public IChatBaseComponent getScoreboardDisplayName()
+ {
+ return handle.getScoreboardDisplayName();
+ }
+
+ @Override
+ public void sendMessage(IChatBaseComponent iChatBaseComponent)
+ {
+ handle.sendMessage( iChatBaseComponent );
+ }
+
+ @Override
+ public boolean a(int i, String s)
+ {
+ return true;
+ }
+
+ @Override
+ public ChunkCoordinates getChunkCoordinates()
+ {
+ return handle.getChunkCoordinates();
+ }
+
+ @Override
+ public World getWorld()
+ {
+ return handle.getWorld();
+ }
+ }
+
+ private static class ConsoleListener implements ICommandListener {
+
+ private final CommandSender sender;
+
+ public ConsoleListener( CommandSender sender )
+ {
+ this.sender = sender;
+ }
+
+ @Override
+ public String getName()
+ {
+ return sender.getName();
+ }
+
+ @Override
+ public IChatBaseComponent getScoreboardDisplayName()
+ {
+ return new ChatComponentText( getName() );
+ }
+
+ @Override
+ public void sendMessage( IChatBaseComponent iChatBaseComponent )
+ {
+ sender.sendMessage( iChatBaseComponent.e() );
+ }
+
+ @Override
+ public boolean a( int i, String s )
+ {
+ return true;
+ }
+
+ @Override
+ public ChunkCoordinates getChunkCoordinates()
+ {
+ return new ChunkCoordinates( 0, 0, 0 );
+ }
+
+ @Override
+ public World getWorld()
+ {
+ return MinecraftServer.getServer().getWorld();
+ }
+ }
+}
--
1.8.4.msysgit.0

4
CraftBukkit-Patches/0074-Fire-PreLogin-Events-in-Offline-Mode.patch → CraftBukkit-Patches/0073-Fire-PreLogin-Events-in-Offline-Mode.patch
View File

@ -1,4 +1,4 @@
From 9ec255571174d13504b89b03e0625ec93ae1291b Mon Sep 17 00:00:00 2001
From 04aec6373875a2a3693d072f4f456a359b05a22c Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 18 Dec 2013 13:32:10 +1100
Subject: [PATCH] Fire PreLogin Events in Offline Mode
@ -126,5 +126,5 @@ index cc96775..ea8c269 100644
+ }
}
--
1.8.3.2
1.8.4.msysgit.0

4
CraftBukkit-Patches/0075-Log-Cause-of-Unexpected-Exceptions.patch → CraftBukkit-Patches/0074-Log-Cause-of-Unexpected-Exceptions.patch
View File

@ -1,4 +1,4 @@
From 4122933db23b8aa16409e40caac5858750e577ce Mon Sep 17 00:00:00 2001
From ed994e973f6453e5e7b150941723e2a7a4ae27c7 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 18 Dec 2013 13:39:14 +1100
Subject: [PATCH] Log Cause of Unexpected Exceptions
@ -22,5 +22,5 @@ index 94da13d..3f04557 100644
if (throwable instanceof ReportedException) {
--
1.8.3.2
1.8.4.msysgit.0

6
CraftBukkit-Patches/0076-Particle-API.patch → CraftBukkit-Patches/0075-Particle-API.patch
View File

@ -1,4 +1,4 @@
From 2095b2dd8dea14d125a67013ec25158c85195bd5 Mon Sep 17 00:00:00 2001
From 472f7020fe402c91523264825743ed0e6a7b1961 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Fri, 20 Dec 2013 21:36:06 +0000
Subject: [PATCH] Particle API
@ -18,7 +18,7 @@ index 7de0de5..7eca388 100644
datavalue = 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 468a4e1..c90dd54 100644
index 57dd4e7..948e81d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -779,28 +779,18 @@ public class CraftWorld implements World {
@ -117,5 +117,5 @@ index 468a4e1..c90dd54 100644
public Spigot spigot()
--
1.8.3.2
1.8.4.msysgit.0

4
CraftBukkit-Patches/0077-Fix-Biome-Decoration-Crashes.patch → CraftBukkit-Patches/0076-Fix-Biome-Decoration-Crashes.patch
View File

@ -1,4 +1,4 @@
From af606d138eeee9a5a8ddd4174f4ba408b7c4c8c8 Mon Sep 17 00:00:00 2001
From 00fe2f82e2a66288e7b8ce82e00eca55a43acf05 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 5 Jan 2014 09:35:01 +1100
Subject: [PATCH] Fix Biome Decoration Crashes
@ -107,5 +107,5 @@ index b048d6c..962d719 100644
+ // Spigot End
}
--
1.8.3.2
1.8.4.msysgit.0

2
CraftBukkit-Patches/0078-Save-ticks-lived-to-nbttag.patch → CraftBukkit-Patches/0077-Save-ticks-lived-to-nbttag.patch
View File

@ -1,4 +1,4 @@
From 7c5598ef88c5e69e950876571200323d7ea9df0f Mon Sep 17 00:00:00 2001
From 86cde1d0ab89b153add30664042d11898a701ee1 Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de>
Date: Tue, 9 Jul 2013 00:11:12 +0200
Subject: [PATCH] Save ticks lived to nbttag

8
CraftBukkit-Patches/0079-More-Efficient-GetCubes.patch → CraftBukkit-Patches/0078-More-Efficient-GetCubes.patch
View File

@ -1,14 +1,14 @@
From f0ed5217da8461370856ab85c01932026f4edd91 Mon Sep 17 00:00:00 2001
From 069a3c883232a653eca82fbdf2edd807f8bfea05 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 11 Jun 2013 12:17:37 +1000
Subject: [PATCH] More Efficient GetCubes
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 1aca7f6..04f5ed1 100644
index 026db15..9bc4256 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1063,23 +1063,42 @@ public abstract class World implements IBlockAccess {
@@ -1077,23 +1077,42 @@ public abstract class World implements IBlockAccess {
int i1 = MathHelper.floor(axisalignedbb.c);
int j1 = MathHelper.floor(axisalignedbb.f + 1.0D);
@ -64,5 +64,5 @@ index 1aca7f6..04f5ed1 100644
double d0 = 0.25D;
List list = this.getEntities(entity, axisalignedbb.grow(d0, d0, d0));
--
1.8.3.2
1.8.4.msysgit.0

4
CraftBukkit-Patches/0080-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch → CraftBukkit-Patches/0079-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
View File

@ -1,4 +1,4 @@
From 2af65921e4e70431afb681c5f12d33b771c31e5e Mon Sep 17 00:00:00 2001
From 0ec77cb57bcc3c8d6737d50fea8ba570636bda8c Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 2 Feb 2014 16:55:46 +0000
Subject: [PATCH] Add Option to Nerf Mobs from Spawner's
@ -80,5 +80,5 @@ index e7cb99d..018ec18 100644
+ }
}
--
1.8.3.2
1.8.4.msysgit.0

8
CraftBukkit-Patches/0081-Warn-if-PermGen-may-be-insufficient.patch → CraftBukkit-Patches/0080-Warn-if-PermGen-may-be-insufficient.patch
View File

@ -1,14 +1,14 @@
From 8419a2d0a468dd909b42f8d81b415d2945765827 Mon Sep 17 00:00:00 2001
From b5692baac431c0b3aba6a4fdcd3f32ea93b6c6cf Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 23 Dec 2013 14:07:41 +1100
Subject: [PATCH] Warn if PermGen may be insufficient
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 07c26f1..246e641 100644
index 8d127fb..062dbec 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -149,6 +149,22 @@ public class Main {
@@ -155,6 +155,22 @@ public class Main {
useConsole = false;
}
@ -32,5 +32,5 @@ index 07c26f1..246e641 100644
MinecraftServer.main(options);
} catch (Throwable t) {
--
1.8.3.2
1.8.4.msysgit.0

8
CraftBukkit-Patches/0082-Disable-Connected-Check-on-setScoreboard.patch → CraftBukkit-Patches/0081-Disable-Connected-Check-on-setScoreboard.patch
View File

@ -1,14 +1,14 @@
From 67ce7323ec739babf894b6dc2f5256d496a5d1b7 Mon Sep 17 00:00:00 2001
From 7ffe1f770f529b7bf3278d25af509d1ab91f21be Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 23 Dec 2013 15:57:57 +1100
Subject: [PATCH] Disable Connected Check on setScoreboard
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 4fa4142..b130951 100644
index 5fe8276..0e8fedf 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1194,7 +1194,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1192,7 +1192,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
throw new IllegalStateException("Cannot set scoreboard yet");
}
if (playerConnection.isDisconnected()) {
@ -18,5 +18,5 @@ index 4fa4142..b130951 100644
this.server.getScoreboardManager().setPlayerBoard(this, scoreboard);
--
1.8.3.2
1.8.4.msysgit.0

14
CraftBukkit-Patches/0083-Add-Late-Bind-Option.patch → CraftBukkit-Patches/0082-Add-Late-Bind-Option.patch
View File

@ -1,4 +1,4 @@
From d5a5c3bed0ddd583c4cd80da21c9e1dfeace2d54 Mon Sep 17 00:00:00 2001
From e16c36c3db4e4483dc97a9f6016e678c3a765e38 Mon Sep 17 00:00:00 2001
From: slide23 <me@slide.ws>
Date: Fri, 20 Dec 2013 20:15:33 -0600
Subject: [PATCH] Add Late Bind Option
@ -54,14 +54,12 @@ index c9bb3a6..8ec6474
h.info("Starting GS4 status listener");
this.j = new RemoteStatusListener(this);
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
old mode 100644
new mode 100755
index 56767ac..e11e2b8
index cfddd28..69306cb 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -213,4 +213,9 @@ public class SpigotConfig
VanillaCommandWrapper.allowedCommands.add( command );
}
@@ -198,4 +198,9 @@ public class SpigotConfig
System.setProperty( "io.netty.eventLoopThreads", Integer.toString( count ) );
Bukkit.getLogger().log( Level.INFO, "Using {0} threads for Netty based IO", count );
}
+
+ public static boolean lateBind;
@ -70,5 +68,5 @@ index 56767ac..e11e2b8
+ }
}
--
1.8.3.2
1.8.4.msysgit.0

4
CraftBukkit-Patches/0085-Update-Chest-Animation-when-Cancelling-Event.patch → CraftBukkit-Patches/0083-Update-Chest-Animation-when-Cancelling-Event.patch
View File

@ -1,4 +1,4 @@
From dd3022afd3bbb648f0c2fbb9b0ea543337145f83 Mon Sep 17 00:00:00 2001
From d4993990500cb690905e2a08ce7d37cd74fb40f6 Mon Sep 17 00:00:00 2001
From: bloodshot <jdroque@gmail.com>
Date: Mon, 6 Jan 2014 16:29:51 -0500
Subject: [PATCH] Update Chest Animation when Cancelling Event
@ -113,5 +113,5 @@ index ab39926..550ef44 100644
if (this.activeContainer != this.defaultContainer) {
--
1.8.3.2
1.8.4.msysgit.0

42
CraftBukkit-Patches/0084-Disconnect-for-spam-in-the-main-thread.patch
View File

@ -1,42 +0,0 @@
From bb7fa8838e6ec0bfefb57159d8e33dc0e06cf6d2 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Fri, 3 Jan 2014 17:30:52 +0000
Subject: [PATCH] Disconnect for spam in the main thread
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 1903362..f7fdca3 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -838,7 +838,27 @@ public class PlayerConnection implements PacketPlayInListener {
// this.chatThrottle += 20;
if (chatSpamField.addAndGet(this, 20) > 200 && !this.minecraftServer.getPlayerList().isOp(this.player.getName())) {
// CraftBukkit end
- this.disconnect("disconnect.spam");
+ if (packetplayinchat.a()) { // Spigot - Thread safety
+ Waitable waitable = new Waitable() {
+ @Override
+ protected Object evaluate() {
+ PlayerConnection.this.disconnect( "disconnect.spam" );
+ return null;
+ }
+ };
+
+ this.minecraftServer.processQueue.add(waitable);
+
+ try {
+ waitable.get();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ } catch (ExecutionException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ PlayerConnection.this.disconnect( "disconnect.spam" );
+ }
}
}
}
--
1.8.3.2

6
CraftBukkit-Patches/0086-Update-Client-s-Hand-when-BlockPlaceEvent-Cancelled.patch → CraftBukkit-Patches/0084-Update-Client-s-Hand-when-BlockPlaceEvent-Cancelled.patch
View File

@ -1,4 +1,4 @@
From 9762f6aa69c704beaaedf9c7978c3f471e9a5e9e Mon Sep 17 00:00:00 2001
From ad4c58f956161e81eb940369b6ec91cb1c8cab45 Mon Sep 17 00:00:00 2001
From: bloodshot <jdroque@gmail.com>
Date: Mon, 6 Jan 2014 18:02:01 -0500
Subject: [PATCH] Update Client's Hand when BlockPlaceEvent Cancelled
@ -16,7 +16,7 @@ PlayerConnection.a(handlePlace) not to send the appropriate packet to
client which causes the bug.
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index f7fdca3..91de23b 100644
index c9585fc..9e6901c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -626,7 +626,9 @@ public class PlayerConnection implements PacketPlayInListener {
@ -31,5 +31,5 @@ index f7fdca3..91de23b 100644
flag = true;
--
1.8.3.2
1.8.4.msysgit.0

11
CraftBukkit-Patches/0087-Allow-statistics-to-be-disabled-forced.patch → CraftBukkit-Patches/0085-Allow-statistics-to-be-disabled-forced.patch
View File

@ -1,4 +1,4 @@
From 5c295074ef0b943acc0100871b2aec1dfa5ed3bc Mon Sep 17 00:00:00 2001
From 14d8d53e0ce9be370a14aa9ad04c279f2c633f26 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Tue, 7 Jan 2014 15:56:26 +0000
Subject: [PATCH] Allow statistics to be disabled/forced
@ -40,10 +40,10 @@ index 2f980cb..3f78728 100644
super.a(entityhuman, statistic, i);
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index e11e2b8..205249e 100755
index 69306cb..eaafc2d 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -11,11 +11,14 @@ import java.util.HashMap;
@@ -10,10 +10,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
@ -53,12 +53,11 @@ index e11e2b8..205249e 100755
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.SimpleCommandMap;
+import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.YamlConfiguration;
public class SpigotConfig
@@ -218,4 +221,31 @@ public class SpigotConfig
@@ -203,4 +206,31 @@ public class SpigotConfig
private static void lateBind() {
lateBind = getBoolean( "settings.late-bind", false );
}
@ -91,5 +90,5 @@ index e11e2b8..205249e 100755
+ }
}
--
1.8.3.2
1.8.4.msysgit.0

4
CraftBukkit-Patches/0088-Fix-anvil-collisions.patch → CraftBukkit-Patches/0086-Fix-anvil-collisions.patch
View File

@ -1,4 +1,4 @@
From 8a5fbfc82857d44bf242a65884aad5e52efe0592 Mon Sep 17 00:00:00 2001
From 8df7a1623bb7189ef53ae9b715cd29d2e780241f Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Thu, 9 Jan 2014 14:19:12 +0000
Subject: [PATCH] Fix anvil collisions
@ -25,5 +25,5 @@ index 9e1ce2f..1fa14c5 100644
return false;
}
--
1.8.3.2
1.8.4.msysgit.0

4
CraftBukkit-Patches/0089-Fix-ItemStack-Unbreakable-Code.patch → CraftBukkit-Patches/0087-Fix-ItemStack-Unbreakable-Code.patch
View File

@ -1,4 +1,4 @@
From aae88abcb7bff6c316cbc4028b3bbf79d4e4617c Mon Sep 17 00:00:00 2001
From 6209240be12264c5ab3a9fb966b0070634e835f9 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 10 Jan 2014 15:15:50 +1100
Subject: [PATCH] Fix ItemStack Unbreakable Code
@ -24,5 +24,5 @@ index f32322e..37ceade 100644
public boolean usesData() {
--
1.8.3.2
1.8.4.msysgit.0

4
CraftBukkit-Patches/0090-Try-and-Debug-Crash-Reports-Crashing.patch → CraftBukkit-Patches/0088-Try-and-Debug-Crash-Reports-Crashing.patch
View File

@ -1,4 +1,4 @@
From 55c88983e542cb807461ce06e8d892090b9a3c61 Mon Sep 17 00:00:00 2001
From 02584e9b58c12fd11ac01f605188da4614e93500 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 12 Jan 2014 20:56:41 +1100
Subject: [PATCH] Try and Debug Crash Reports Crashing
@ -37,5 +37,5 @@ index 3f04557..7616d7b 100644
throw new ReportedException(crashreport);
}
--
1.8.3.2
1.8.4.msysgit.0

4
CraftBukkit-Patches/0091-Replace-AutoSave-Mechanism.patch → CraftBukkit-Patches/0089-Replace-AutoSave-Mechanism.patch
View File

@ -1,4 +1,4 @@
From 9d257eb2927d480f108701500d0a300d1ecd617d Mon Sep 17 00:00:00 2001
From 881a1a02214adbec1f4b19c43aacb653b2713701 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 12 Jan 2014 21:07:18 +1100
Subject: [PATCH] Replace AutoSave Mechanism
@ -28,5 +28,5 @@ index 7616d7b..588ce0a 100644
}
--
1.8.3.2
1.8.4.msysgit.0

4
CraftBukkit-Patches/0093-Block-data-values-that-crash-the-client.patch → CraftBukkit-Patches/0090-Block-data-values-that-crash-the-client.patch
View File

@ -1,4 +1,4 @@
From 5c04f4e90cc99661fafbd3277c1e5080e8d90665 Mon Sep 17 00:00:00 2001
From c393d7a9a1fa10421492081cc28b5f5c576e6c4a Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 15 Jan 2014 21:52:47 +0000
Subject: [PATCH] Block data values that crash the client
@ -57,5 +57,5 @@ index 51ebb7e..944170b 100644
if (tileentity != null) {
--
1.8.3.2
1.8.4.msysgit.0

2
CraftBukkit-Patches/0094-Support-vanilla-s-direction-tag-on-fireballs.patch → CraftBukkit-Patches/0091-Support-vanilla-s-direction-tag-on-fireballs.patch
View File

@ -1,4 +1,4 @@
From d6540ef8e196aadbd34069462f569ef165cc476e Mon Sep 17 00:00:00 2001
From 0c49444d17ecd3d12ab3edff2375f68e3dc93914 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Sat, 18 Jan 2014 14:27:03 +0000
Subject: [PATCH] Support vanilla's direction tag on fireballs

41
CraftBukkit-Patches/0092-Fix-ConcurrentModificationException-while-being-idle.patch
View File

@ -1,41 +0,0 @@
From f900a0cd106478ed5382d3934d9a34ef912669b9 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Tue, 14 Jan 2014 20:11:25 +0000
Subject: [PATCH] Fix ConcurrentModificationException while being idle kicked
in a vehicle
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 04f5ed1..ac9b669 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1038,16 +1038,19 @@ public abstract class World implements IBlockAccess {
this.players.remove(entity);
this.everyoneSleeping();
}
+ // Spigot start
+ if (!guardEntityList) { // It will get removed after the tick if we are ticking
+ int i = entity.ai;
+ int j = entity.ak;
- int i = entity.ai;
- int j = entity.ak;
+ if (entity.ah && this.isChunkLoaded(i, j)) {
+ this.getChunkAt(i, j).b(entity);
+ }
- if (entity.ah && this.isChunkLoaded(i, j)) {
- this.getChunkAt(i, j).b(entity);
+ this.entityList.remove(entity);
+ this.b(entity);
}
-
- this.entityList.remove(entity);
- this.b(entity);
+ // Spigot end
}
public void addIWorldAccess(IWorldAccess iworldaccess) {
--
1.8.3.2

4
CraftBukkit-Patches/0095-Support-non-prefixed-URLs.patch → CraftBukkit-Patches/0092-Support-non-prefixed-URLs.patch
View File

@ -1,4 +1,4 @@
From d452ada9b1e3fffbd663996f74d684ff7f1751c2 Mon Sep 17 00:00:00 2001
From 4d3bf4f87b4546727ceb80f5089f12cb0668c513 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Sat, 18 Jan 2014 19:32:42 +0000
Subject: [PATCH] Support non-prefixed URLs
@ -37,5 +37,5 @@ index 66368f4..f4de71c 100644
private void appendNewComponent(int index) {
--
1.8.3.2
1.8.4.msysgit.0

4
CraftBukkit-Patches/0096-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch → CraftBukkit-Patches/0093-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
View File

@ -1,4 +1,4 @@
From 83f40b07823892893854db7993dddb1ab5b24719 Mon Sep 17 00:00:00 2001
From b23012d7cf6830aa7ac71fd0b1a3ad360b68450b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 20 Jan 2014 13:44:07 +1100
Subject: [PATCH] Catch stalling on corrupted map data / NBT arrays.
@ -29,5 +29,5 @@ index 49b3f14..4d6a9da 100644
this.data = new int[j];
--
1.8.3.2
1.8.4.msysgit.0

8
CraftBukkit-Patches/0097-Reduce-memory-of-hiddenPlayers-map.patch → CraftBukkit-Patches/0094-Reduce-memory-of-hiddenPlayers-map.patch
View File

@ -1,14 +1,14 @@
From ed47e5366e39215ef695905ab73c0a00b43478fe Mon Sep 17 00:00:00 2001
From 88a1710f2cdee7cc71c08ffc9b5451fc947618e8 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 20 Jan 2014 13:50:32 +1100
Subject: [PATCH] Reduce memory of hiddenPlayers map.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index b130951..c8aa3f8 100644
index 0e8fedf..a717d34 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -62,7 +62,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -63,7 +63,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
private boolean hasPlayedBefore = false;
private final ConversationTracker conversationTracker = new ConversationTracker();
private final Set<String> channels = new HashSet<String>();
@ -18,5 +18,5 @@ index b130951..c8aa3f8 100644
private double health = 20;
private boolean scaledHealth = false;
--
1.8.3.2
1.8.4.msysgit.0

6
CraftBukkit-Patches/0098-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch → CraftBukkit-Patches/0095-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
View File

@ -1,11 +1,11 @@
From 88c534763961d202a4e6c035ab86a76beb6d0148 Mon Sep 17 00:00:00 2001
From 1854dcfac80bb453bc355573144a01da07fbfb8c Mon Sep 17 00:00:00 2001
From: Dmck2b <dmck2b+github@gmail.com>
Date: Mon, 20 Jan 2014 20:18:23 +0000
Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks
diff --git a/src/main/java/net/minecraft/server/BlockPortal.java b/src/main/java/net/minecraft/server/BlockPortal.java
index 75b833a..4f5bea9 100644
index bec5aa8..222e3ac 100644
--- a/src/main/java/net/minecraft/server/BlockPortal.java
+++ b/src/main/java/net/minecraft/server/BlockPortal.java
@@ -15,7 +15,7 @@ public class BlockPortal extends BlockHalfTransparent {
@ -34,5 +34,5 @@ index 018ec18..5a6e369 100644
+ }
}
--
1.8.3.2
1.8.4.msysgit.0

4
CraftBukkit-Patches/0099-Don-t-let-trees-replace-any-block-when-growing.patch → CraftBukkit-Patches/0096-Don-t-let-trees-replace-any-block-when-growing.patch
View File

@ -1,4 +1,4 @@
From 83d1c5d1f193076363b7e80dba3fecf34bcd496b Mon Sep 17 00:00:00 2001
From 5063e3237baec48336b0205cf5a11f20f04b4157 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Mon, 20 Jan 2014 20:42:28 +0000
Subject: [PATCH] Don't let trees replace any block when growing
@ -23,5 +23,5 @@ index 71ce973..caaac9a 100644
int l3;
--
1.8.3.2
1.8.4.msysgit.0

8
CraftBukkit-Patches/0100-Highly-Optimized-Tick-Loop.patch → CraftBukkit-Patches/0097-Highly-Optimized-Tick-Loop.patch
View File

@ -1,4 +1,4 @@
From e6bbddc5d64a0888b7e55a9b59485224c722c265 Mon Sep 17 00:00:00 2001
From d15323381c6e474f215120e8126ca1ab16d10ab3 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 25 Jan 2014 14:08:35 +1100
Subject: [PATCH] Highly Optimized Tick Loop
@ -94,10 +94,10 @@ index 588ce0a..022e032 100644
this.a((CrashReport) null);
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 205249e..6634292 100755
index eaafc2d..713b351 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -248,4 +248,9 @@ public class SpigotConfig
@@ -233,4 +233,9 @@ public class SpigotConfig
"screen." );
}
}
@ -159,5 +159,5 @@ index 0000000..2b8343d
+ }
+}
--
1.8.3.2
1.8.4.msysgit.0

10
CraftBukkit-Patches/0101-Add-Spigot-Links.patch → CraftBukkit-Patches/0098-Add-Spigot-Links.patch
View File

@ -1,4 +1,4 @@
From 0aa241c591167cc1d647aad6ee34b669f48e3991 Mon Sep 17 00:00:00 2001
From 78b391d8b1befc321d5eee3cf28d541ed68dfa83 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 23 Jan 2014 13:17:35 +1100
Subject: [PATCH] Add Spigot Links
@ -35,17 +35,17 @@ index cda766b..1f12a75 100644
+ * *Note*: this is not needed as the repository we use has Spigot-API too, but you might have a newer one (with your own changes :D)
* Check out this repo and: `mvn clean package`
diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
index 60a894f..072c925 100644
index 129ac34..751bbfc 100644
--- a/src/main/resources/configurations/bukkit.yml
+++ b/src/main/resources/configurations/bukkit.yml
@@ -6,11 +6,10 @@
# If you need help on this file, feel free to join us on irc or leave a message
# on the forums asking for advice.
#
#
-# IRC: #bukkit @ esper.net
-# (If this means nothing to you, just go to http://webchat.esper.net/?channels=bukkit )
-# Forums: http://forums.bukkit.org/forums/bukkit-help.6/
-# Twitter: http://twitter.com/Craftbukkit
-# Twitter: http://twitter.com/CraftBukkit
-# Bug tracker: http://leaky.bukkit.org/
+# IRC: #spigot @ irc.spi.gt
+# (If this means nothing to you, just go to http://irc.spi.gt/iris/?nick=&channels=spigot )
@ -55,5 +55,5 @@ index 60a894f..072c925 100644
settings:
--
1.8.3.2
1.8.4.msysgit.0

8
CraftBukkit-Patches/0102-Configurable-Ping-Sample-Size.patch → CraftBukkit-Patches/0099-Configurable-Ping-Sample-Size.patch
View File

@ -1,4 +1,4 @@
From b4b40136836eb29b280e64679db230a85078905a Mon Sep 17 00:00:00 2001
From 0db2a554328aa2ef05cff12de0e1d22a20b05cd8 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 26 Jan 2014 21:48:34 +1100
Subject: [PATCH] Configurable Ping Sample Size
@ -23,10 +23,10 @@ index 7903c43..f9da452 100644
ServerPing ping = new ServerPing();
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 6634292..d26b621 100755
index 713b351..ba28878 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -253,4 +253,11 @@ public class SpigotConfig
@@ -238,4 +238,11 @@ public class SpigotConfig
{
commands.put( "tps", new TicksPerSecondCommand( "tps" ) );
}
@ -39,5 +39,5 @@ index 6634292..d26b621 100755
+ }
}
--
1.8.3.2
1.8.4.msysgit.0

8
CraftBukkit-Patches/0103-Add-Optional-Tick-Shuffling.patch → CraftBukkit-Patches/0100-Add-Optional-Tick-Shuffling.patch
View File

@ -1,4 +1,4 @@
From a78bccdc4d9a40df173696163ad9e7ddbf167afe Mon Sep 17 00:00:00 2001
From 3368f5075f2101e90bc0240d849030366a39732b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 27 Jan 2014 08:39:26 +1100
Subject: [PATCH] Add Optional Tick Shuffling
@ -24,10 +24,10 @@ index 3691094..c91ed8e 100644
while (iterator.hasNext()) {
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index d26b621..552266b 100755
index ba28878..61fb942 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -260,4 +260,10 @@ public class SpigotConfig
@@ -245,4 +245,10 @@ public class SpigotConfig
playerSample = getInt( "settings.sample-count", 12 );
System.out.println( "Server Ping Player Sample Count: " + playerSample );
}
@ -39,5 +39,5 @@ index d26b621..552266b 100755
+ }
}
--
1.8.3.2
1.8.4.msysgit.0

4
CraftBukkit-Patches/0104-Allow-Configuring-Chunks-per-Packet.patch → CraftBukkit-Patches/0101-Allow-Configuring-Chunks-per-Packet.patch
View File

@ -1,4 +1,4 @@
From ec5983c59a5b16a9df9b5fcce16e348d48918451 Mon Sep 17 00:00:00 2001
From a45410f3c8ae0da95a25556f7c7cbb9c2e638e9b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 28 Jan 2014 20:35:35 +1100
Subject: [PATCH] Allow Configuring Chunks per Packet
@ -34,5 +34,5 @@ index 5a6e369..4cff009 100644
+ }
}
--
1.8.3.2
1.8.4.msysgit.0

8
CraftBukkit-Patches/0105-Implement-Locale-Getter-for-Players.patch → CraftBukkit-Patches/0102-Implement-Locale-Getter-for-Players.patch
View File

@ -1,4 +1,4 @@
From c872ee5a790604d9452b73abfcd0fd6a1c539726 Mon Sep 17 00:00:00 2001
From 8d5ba516981ae96eb4d37b74a6e0ef5a25709739 Mon Sep 17 00:00:00 2001
From: Smove <jan@lavasurvival.net>
Date: Sat, 1 Feb 2014 18:12:16 +1100
Subject: [PATCH] Implement Locale Getter for Players
@ -18,10 +18,10 @@ index 9b853a9..95dbeb9 100644
public final MinecraftServer server;
public final PlayerInteractManager playerInteractManager;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 16b1fc9..1bb1a8f 100644
index a717d34..53c8a0b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1294,6 +1294,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1292,6 +1292,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false );
}
}
@ -35,5 +35,5 @@ index 16b1fc9..1bb1a8f 100644
public Player.Spigot spigot()
--
1.8.3.2
1.8.4.msysgit.0

4
CraftBukkit-Patches/0106-Cap-Entity-Collisions.patch → CraftBukkit-Patches/0103-Cap-Entity-Collisions.patch
View File

@ -1,4 +1,4 @@
From 7f1f0e81cac6af732ae66ca41f6a8f02afcf5942 Mon Sep 17 00:00:00 2001
From b5aa35da1269ff5aee101088271f109376684cba Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 31 Jan 2014 11:18:34 -0500
Subject: [PATCH] Cap Entity Collisions
@ -62,5 +62,5 @@ index 4cff009..979b315 100644
+ }
}
--
1.8.3.2
1.8.4.msysgit.0

2
CraftBukkit-Patches/0107-Fix-dispensing-bone-meal-not-having-the-correct-data.patch → CraftBukkit-Patches/0104-Fix-dispensing-bone-meal-not-having-the-correct-data.patch
View File

@ -1,4 +1,4 @@
From 8cc9273eba7be5873699da83c40349ed4f100543 Mon Sep 17 00:00:00 2001
From f0271bbf68219efc5e8a12917b77c299b794eeb9 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Thu, 6 Feb 2014 21:59:20 +0000
Subject: [PATCH] Fix dispensing bone meal not having the correct data value

20
CraftBukkit-Patches/0108-Spam-Filter-Exclusions.patch → CraftBukkit-Patches/0105-Spam-Filter-Exclusions.patch
View File

@ -1,11 +1,11 @@
From 008bd884e078247a4aac20828ae5dd3ae2ad20e9 Mon Sep 17 00:00:00 2001
From 406fe8af81203e6c840334f49d1c3ed1f553d1af Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 8 Feb 2014 08:13:40 +0000
Subject: [PATCH] Spam Filter Exclusions
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 2b68b96..ddffc96 100644
index 9e6901c..f028c02 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -836,9 +836,19 @@ public class PlayerConnection implements PacketPlayInListener {
@ -26,14 +26,22 @@ index 2b68b96..ddffc96 100644
// this.chatThrottle += 20;
- if (chatSpamField.addAndGet(this, 20) > 200 && !this.minecraftServer.getPlayerList().isOp(this.player.getName())) {
+ if (counted && chatSpamField.addAndGet(this, 20) > 200 && !this.minecraftServer.getPlayerList().isOp(this.player.getName())) {
// CraftBukkit end
if (packetplayinchat.a()) { // Spigot - Thread safety
if (packetplayinchat.a()) {
Waitable waitable = new Waitable() {
@Override
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 769ef2a..3122a18 100755
index 61fb942..8da3cc9 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -266,4 +266,13 @@ public class SpigotConfig
@@ -6,6 +6,7 @@ import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -251,4 +252,13 @@ public class SpigotConfig
{
playerShuffle = getInt( "settings.player-shuffle", 0 );
}

10
CraftBukkit-Patches/0109-Add-Option-to-Silence-CommandBlock-Console.patch → CraftBukkit-Patches/0106-Add-Option-to-Silence-CommandBlock-Console.patch
View File

@ -1,11 +1,11 @@
From 56a408d52daeb1b53f9e426bc81dedf2b949df7b Mon Sep 17 00:00:00 2001
From 93c0ef3e537b374488ac7cc9b868f64977a4e529 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 9 Feb 2014 14:39:01 +1100
Subject: [PATCH] Add Option to Silence CommandBlock Console
diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
index e58be15..e6d678f 100644
index e63f17c..e2389d4 100644
--- a/src/main/java/net/minecraft/server/CommandDispatcher.java
+++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
@@ -82,7 +82,7 @@ public class CommandDispatcher extends CommandHandler implements ICommandDispatc
@ -18,10 +18,10 @@ index e58be15..e6d678f 100644
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 3122a18..1a05562 100755
index 8da3cc9..7cba69f 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -275,4 +275,10 @@ public class SpigotConfig
@@ -261,4 +261,10 @@ public class SpigotConfig
"/skill"
} ) );
}
@ -33,5 +33,5 @@ index 3122a18..1a05562 100755
+ }
}
--
1.8.3.2
1.8.4.msysgit.0

8
CraftBukkit-Patches/0111-Add-support-for-fetching-hidden-players.patch → CraftBukkit-Patches/0107-Add-support-for-fetching-hidden-players.patch
View File

@ -1,14 +1,14 @@
From b3f3233165d3adab94cebcf984d37120a95dd4df Mon Sep 17 00:00:00 2001
From 03ceee9e1a011f7ecdd96ce6c571d0f5264f74cb Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Sun, 9 Feb 2014 14:03:03 -0500
Subject: [PATCH] Add support for fetching hidden players
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 1bb1a8f..84d60c3 100644
index 53c8a0b..db6e5b8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1300,6 +1300,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1298,6 +1298,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
{
return getHandle().locale;
}
@ -22,5 +22,5 @@ index 1bb1a8f..84d60c3 100644
public Player.Spigot spigot()
--
1.7.10.4
1.8.4.msysgit.0

10
CraftBukkit-Patches/0112-Allow-Disabling-Creative-Item-Filter.patch → CraftBukkit-Patches/0108-Allow-Disabling-Creative-Item-Filter.patch
View File

@ -1,11 +1,11 @@
From e24fa2b4f987811d1fabcb635f7a5904ed3d6fde Mon Sep 17 00:00:00 2001
From a7f19eb0f5dd8d22baf5992e28232f3d12a9c811 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 12 Feb 2014 18:18:01 +1100
Subject: [PATCH] Allow Disabling Creative Item Filter
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index ddffc96..d23cb7b 100644
index f028c02..0f0fc49 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1489,7 +1489,7 @@ public class PlayerConnection implements PacketPlayInListener {
@ -18,10 +18,10 @@ index ddffc96..d23cb7b 100644
// CraftBukkit start - Call click event
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 1a05562..add2b27 100755
index 7cba69f..7589246 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -281,4 +281,10 @@ public class SpigotConfig
@@ -267,4 +267,10 @@ public class SpigotConfig
{
silentCommandBlocks = getBoolean( "commands.silent-commandblock-console", false );
}
@ -33,5 +33,5 @@ index 1a05562..add2b27 100755
+ }
}
--
1.8.3.2
1.8.4.msysgit.0

8
CraftBukkit-Patches/0113-Cap-Channel-Registrations.patch → CraftBukkit-Patches/0109-Cap-Channel-Registrations.patch
View File

@ -1,14 +1,14 @@
From 86788e0d4bd7d8e5d07c7a922e900bf786952ab3 Mon Sep 17 00:00:00 2001
From 66c35080d7b742d51843ee7b424af851ae2f27b4 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 12 Feb 2014 20:02:58 +1100
Subject: [PATCH] Cap Channel Registrations
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 84d60c3..d83eefb 100644
index db6e5b8..9b0672b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1025,6 +1025,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1023,6 +1023,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void addChannel(String channel) {
@ -17,5 +17,5 @@ index 84d60c3..d83eefb 100644
server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel));
}
--
1.8.3.2
1.8.4.msysgit.0

36
CraftBukkit-Patches/0110-Fire-BlockPlaceEvent-for-Half-Slab-Completion.patch
View File

@ -1,36 +0,0 @@
From d6fd41ea6e11a575f1b60478f52667f41c73646f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 7 Feb 2014 23:21:16 -0500
Subject: [PATCH] Fire BlockPlaceEvent for Half Slab Completion
Fixes BUKKIT-5390
diff --git a/src/main/java/net/minecraft/server/ItemStep.java b/src/main/java/net/minecraft/server/ItemStep.java
index 6448f35..59bada2 100644
--- a/src/main/java/net/minecraft/server/ItemStep.java
+++ b/src/main/java/net/minecraft/server/ItemStep.java
@@ -54,6 +54,7 @@ public class ItemStep extends ItemBlock {
}
private boolean a(ItemStack itemstack, EntityHuman entityhuman, World world, int i, int j, int k, int l) {
+ final int clickedX = i, clickedY = j, clickedZ = k; // CraftBukkit
if (l == 0) {
--j;
}
@@ -83,8 +84,11 @@ public class ItemStep extends ItemBlock {
int j1 = i1 & 7;
if (block == this.c && j1 == itemstack.getData()) {
- if (world.b(this.d.a(world, i, j, k)) && world.setTypeAndData(i, j, k, this.d, j1, 3)) {
- world.makeSound((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), this.d.stepSound.getPlaceSound(), (this.d.stepSound.getVolume1() + 1.0F) / 2.0F, this.d.stepSound.getVolume2() * 0.8F);
+ // CraftBukkit start - world.setTypeIdAndData -> processBlockPlace()
+ //if (world.b(this.d.a(world, i, j, k)) && world.setTypeAndData(i, j, k, this.d, j1, 3)) {
+ if (world.b(this.d.a(world, i, j, k)) && processBlockPlace(world, entityhuman, null, i, j, k, this.d, j1, clickedX, clickedY, clickedZ)) {
+ //world.makeSound((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), this.d.stepSound.getPlaceSound(), (this.d.stepSound.getVolume1() + 1.0F) / 2.0F, this.d.stepSound.getVolume2() * 0.8F);
+ // CraftBukkit end
--itemstack.count;
}
--
1.8.3.2