spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-04-13 09:32:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rebuild patches

Browse source
This commit is contained in:
md_5 2018-07-26 20:46:26 +10:00
parent 0b44fa0bd4
commit f68f5a8253
24 changed files with 96 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Bukkit-Patches/0002-Skeleton-API-Implementations.patch
View file

@ -1,14 +1,14 @@
From e509a9dbfc12a6f121e9dcba76b0c012f5faf99a Mon Sep 17 00:00:00 2001
From 28f1b85d4b66be8f2500acf576e114ff4afca2ba Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 15 May 2017 15:16:15 +1000
Subject: [PATCH] Skeleton API Implementations
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index a3eafe70..3ffce71b 100644
index bdd5a753..ae122939 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1235,4 +1235,9 @@ public final class Bukkit {
@@ -1261,4 +1261,9 @@ public final class Bukkit {
public static UnsafeValues getUnsafe() {
return server.getUnsafe();
}
@ -19,10 +19,10 @@ index a3eafe70..3ffce71b 100644
+ }
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index d69fa6a9..65f8b268 100644
index 4daee3b0..8fb0c750 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1016,4 +1016,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1042,4 +1042,13 @@ public interface Server extends PluginMessageRecipient {
*/
@Deprecated
UnsafeValues getUnsafe();

8
Bukkit-Patches/0003-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From 1dbcb6a2878aa7f8179a87405c83a0c7d000343a Mon Sep 17 00:00:00 2001
From d52240ba99496bdc6e476ad18659461d06990898 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 2 Jun 2013 10:42:57 +1000
Subject: [PATCH] Spigot Timings
@ -8,7 +8,7 @@ Adds performance tracking timings all around the Minecraft Server, and improves
Plugins can track their own timings with CustomTimingsHandler
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 3ffce71b..27c69e96 100644
index ae122939..ed75ed90 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -534,6 +534,7 @@ public final class Bukkit {
@ -20,10 +20,10 @@ index 3ffce71b..27c69e96 100644
/**
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 65f8b268..39b4b27c 100644
index 8fb0c750..9352ff89 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1021,6 +1021,10 @@ public interface Server extends PluginMessageRecipient {
@@ -1047,6 +1047,10 @@ public interface Server extends PluginMessageRecipient {
public class Spigot
{

6
Bukkit-Patches/0023-BungeeCord-Chat-API.patch
View file

@ -1,4 +1,4 @@
From fe876d095a9b60c1ffb8867ebe461ce634762c9d Mon Sep 17 00:00:00 2001
From 0f352ea4cdb1c526e76e64874adfef17d241c867 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 13 Dec 2014 02:59:14 +0100
Subject: [PATCH] BungeeCord Chat API
@ -268,10 +268,10 @@ index b8872b41..adbae51a 100644
* Gets the char value associated with this color
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 65641699..a3468660 100644
index ca585dc6..23d065c1 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1016,6 +1016,24 @@ public interface Server extends PluginMessageRecipient {
@@ -1042,6 +1042,24 @@ public interface Server extends PluginMessageRecipient {
{
throw new UnsupportedOperationException( "Not supported yet." );
}

6
Bukkit-Patches/0024-Add-restart-API.patch
View file

@ -1,14 +1,14 @@
From 7b0e76dfaeb3471c2d8523a57488a6664e5befd5 Mon Sep 17 00:00:00 2001
From 236967585c90d80ceec6ec1e6a442b50396c7b86 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 13 Jul 2015 19:10:15 +1000
Subject: [PATCH] Add restart API.
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index a3468660..053a24dc 100644
index 23d065c1..a766ee96 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1034,6 +1034,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1060,6 +1060,13 @@ public interface Server extends PluginMessageRecipient {
public void broadcast(net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");
}

12
CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch
View file

@ -1,4 +1,4 @@
From d54f2d5aa988c8017b7bd5694a99dd7b5780796c Mon Sep 17 00:00:00 2001
From 3f197d8179238db9284a8cd16144060bf8b3ad7c 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
@ -6,10 +6,10 @@ Subject: [PATCH] Skeleton API Implementations
This contains the basic, empty implementations for some Spigot-API extensions. They are included early in the patching progress so that compilation will still succeed midway despite the APIs only being provided by subsequent patches.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c5e1c0374..73e4cb4aa 100644
index 61d9fa33c..d9239d358 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1766,4 +1766,14 @@ public final class CraftServer implements Server {
@@ -1768,4 +1768,14 @@ public final class CraftServer implements Server {
public UnsafeValues getUnsafe() {
return CraftMagicNumbers.INSTANCE;
}
@ -25,10 +25,10 @@ index c5e1c0374..73e4cb4aa 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 162c79e88..dbcced1a3 100644
index 9b295cdc1..6a87562b6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1579,4 +1579,14 @@ public class CraftWorld implements World {
@@ -1575,4 +1575,14 @@ public class CraftWorld implements World {
cps.unload(chunk);
}
}
@ -180,7 +180,7 @@ index c8654c68f..0c1bca2bd 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index ff7ec7e2b..8acc6397b 100644
index f47a36236..bbb72e3b5 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -966,4 +966,16 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {

8
CraftBukkit-Patches/0004-Spigot-Configuration.patch
View file

@ -1,4 +1,4 @@
From 7f5e1cdcbdba8f6877b3edbb1e3276802167cae9 Mon Sep 17 00:00:00 2001
From b6db4e84d4857af755abf42e1b0b3b5d7f7b6a16 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
@ -51,10 +51,10 @@ index 000992db7..28cb33095 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 73e4cb4aa..6804b84fa 100644
index d9239d358..7a437cd27 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -722,6 +722,7 @@ public final class CraftServer implements Server {
@@ -723,6 +723,7 @@ public final class CraftServer implements Server {
logger.log(Level.WARNING, "Failed to load banned-players.json, " + ex.getMessage());
}
@ -62,7 +62,7 @@ index 73e4cb4aa..6804b84fa 100644
for (WorldServer world : console.worlds) {
world.worldData.setDifficulty(difficulty);
world.setSpawnFlags(monsters, animals);
@@ -736,12 +737,14 @@ public final class CraftServer implements Server {
@@ -737,12 +738,14 @@ public final class CraftServer implements Server {
} else {
world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
}

12
CraftBukkit-Patches/0007-Async-Operation-Catching.patch
View file

@ -1,4 +1,4 @@
From ad3abfbdc0f3615e7b996d95ac7963f2fcdc460b Mon Sep 17 00:00:00 2001
From 0f2fe6acdf257b005b7784967d0fe1664360f318 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 25 Mar 2014 16:10:01 +1100
Subject: [PATCH] Async Operation Catching
@ -115,10 +115,10 @@ index 457e868d8..882fa397f 100644
// this.entityList.addAll(collection);
Iterator iterator = collection.iterator();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6804b84fa..099bc9e34 100644
index 7a437cd27..0140df40a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -668,6 +668,7 @@ public final class CraftServer implements Server {
@@ -669,6 +669,7 @@ public final class CraftServer implements Server {
public boolean dispatchCommand(CommandSender sender, String commandLine) {
Validate.notNull(sender, "Sender cannot be null");
Validate.notNull(commandLine, "CommandLine cannot be null");
@ -127,7 +127,7 @@ index 6804b84fa..099bc9e34 100644
if (commandMap.dispatch(sender, commandLine)) {
return true;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index dbcced1a3..c6faa4bfe 100644
index 6a87562b6..08765768a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -178,6 +178,7 @@ public class CraftWorld implements World {
@ -146,7 +146,7 @@ index dbcced1a3..c6faa4bfe 100644
if (isChunkInUse(x, z)) {
return false;
}
@@ -260,6 +262,7 @@ public class CraftWorld implements World {
@@ -256,6 +258,7 @@ public class CraftWorld implements World {
}
public boolean loadChunk(int x, int z, boolean generate) {
@ -155,7 +155,7 @@ index dbcced1a3..c6faa4bfe 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 7a3313084..db1338561 100644
index 02bf84009..093b5a8f4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -250,6 +250,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

10
CraftBukkit-Patches/0009-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From 638ccd1e6396da6b58cc60744a760a1711417f8e Mon Sep 17 00:00:00 2001
From cd4d1518d647449b0a14d1bf99ba9bd25ed416e6 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Spigot Timings
@ -6,7 +6,7 @@ Subject: [PATCH] Spigot Timings
Overhauls the Timings System adding performance tracking all around the Minecraft Server
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 684fa0753..3e719d5cd 100644
index ba0dcbaed..410601d5f 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -123,11 +123,13 @@ public class ChunkProviderServer implements IChunkProvider {
@ -343,7 +343,7 @@ index 55022c848..de497fa50 100644
this.methodProfiler.e();
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 94a4cc7f1..66420735c 100644
index e39d5f0a7..6ca2f9e8d 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1559,6 +1559,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -556,10 +556,10 @@ index a9a257b95..4d5bede24 100644
public boolean j_() {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 099bc9e34..b53223db1 100644
index 0140df40a..eebed5b20 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1774,6 +1774,11 @@ public final class CraftServer implements Server {
@@ -1776,6 +1776,11 @@ public final class CraftServer implements Server {
private final Spigot spigot = new Spigot()
{

6
CraftBukkit-Patches/0015-PlayerItemDamageEvent.patch
View file

@ -1,14 +1,14 @@
From 9a23b9d645501b3a7b16a10ec627377be31ecead Mon Sep 17 00:00:00 2001
From 898a00278c68bf9aa8fb12f7d20b82d2e8f88216 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 4 Mar 2013 18:45:52 +1100
Subject: [PATCH] PlayerItemDamageEvent
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 2b36beeaf..f5e311f2a 100644
index 4cca55677..0d26fc56d 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -352,6 +352,18 @@ public final class ItemStack {
@@ -356,6 +356,18 @@ public final class ItemStack {
}
i -= k;

6
CraftBukkit-Patches/0018-Close-Unloaded-Save-Files.patch
View file

@ -1,4 +1,4 @@
From 467c44744486c51d5a2758bd73bc6b4afc1dbe00 Mon Sep 17 00:00:00 2001
From 4f609878e20d3cf9fe5105e76dbcd10e2a037f8f 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 7ef75de20..0e91aeec3 100644
public static synchronized RegionFile a(File file, int i, int j) {
File file1 = new File(file, "region");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b53223db1..52465acea 100644
index eebed5b20..a535ee860 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1003,6 +1003,31 @@ public final class CraftServer implements Server {
@@ -1004,6 +1004,31 @@ public final class CraftServer implements Server {
worlds.remove(world.getName().toLowerCase(java.util.Locale.ENGLISH));
console.worlds.remove(console.worlds.indexOf(handle));

6
CraftBukkit-Patches/0023-Allow-Disabling-of-Command-TabComplete.patch
View file

@ -1,4 +1,4 @@
From 9ce4bd9551226b42402e7fdc7dcc9f29471c62cb Mon Sep 17 00:00:00 2001
From b4b0625682c1adc23770b0a9ee98a00852a6ffed 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
@ -25,10 +25,10 @@ index 8c7c8a043..c9eadd560 100644
if (commandnode2.canUse(commandlistenerwrapper)) {
ArgumentBuilder argumentbuilder = commandnode2.createBuilder();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 52465acea..8912d91c0 100644
index a535ee860..9882ce4ef 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1593,6 +1593,13 @@ public final class CraftServer implements Server {
@@ -1595,6 +1595,13 @@ public final class CraftServer implements Server {
}
public List<String> tabCompleteCommand(Player player, String message, WorldServer world, Vec3D pos) {

6
CraftBukkit-Patches/0024-Configurable-Messages.patch
View file

@ -1,4 +1,4 @@
From 516f840fd039147e63c221e2184912ba776c3ccf Mon Sep 17 00:00:00 2001
From 58eb19cf28b8daa80eeaabd09ef38fc308a5cdbb 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
@ -45,10 +45,10 @@ index 2d70ab313..c77d04acd 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8912d91c0..509cb8181 100644
index 9882ce4ef..849f2c236 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -674,11 +674,11 @@ public final class CraftServer implements Server {
@@ -675,11 +675,11 @@ public final class CraftServer implements Server {
return true;
}

6
CraftBukkit-Patches/0037-Watchdog-Thread.patch
View file

@ -1,4 +1,4 @@
From 5ee809cb94e282dfd3f27eb98337ab254bc4d3c9 Mon Sep 17 00:00:00 2001
From e98cc9d778a58a60c84ca25939774b7a05feea2c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 5 Aug 2014 17:20:19 +0100
Subject: [PATCH] Watchdog Thread.
@ -38,10 +38,10 @@ index 4b865bc97..af93b811c 100644
org.spigotmc.CustomTimingsHandler.tick(); // Spigot
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 509cb8181..2ef172a4e 100644
index 849f2c236..87be3a337 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1811,6 +1811,11 @@ public final class CraftServer implements Server {
@@ -1813,6 +1813,11 @@ public final class CraftServer implements Server {
{
return org.spigotmc.SpigotConfig.config;
}

11
CraftBukkit-Patches/0039-Fire-PreLogin-Events-in-Offline-Mode.patch
View file

@ -1,11 +1,11 @@
From 6240ab1bd948a8462b44a216c76218bbfbc2486c Mon Sep 17 00:00:00 2001
From 1ab17510082ee629ea691e47b33bac2074377ee9 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
diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
index acc2f0b60..0cf9d4bde 100644
index acc2f0b60..c777c9dfd 100644
--- a/src/main/java/net/minecraft/server/LoginListener.java
+++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -93,10 +93,23 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@ -32,7 +32,7 @@ index acc2f0b60..0cf9d4bde 100644
// CraftBukkit start - fire PlayerLoginEvent
EntityPlayer s = this.server.getPlayerList().attemptLogin(this, this.i, hostname);
@@ -140,7 +153,22 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -140,7 +153,21 @@ public class LoginListener implements PacketLoginInListener, ITickable {
this.g = LoginListener.EnumProtocolState.KEY;
this.networkManager.sendPacket(new PacketLoginOutEncryptionBegin("", this.server.G().getPublic(), this.e));
} else {
@ -45,7 +45,6 @@ index acc2f0b60..0cf9d4bde 100644
+ try {
+ initUUID();
+ new LoginHandler().fireEvents();
+ LoginListener.this.g = LoginListener.EnumProtocolState.READY_TO_ACCEPT;
+ } catch (Exception ex) {
+ disconnect("Failed to verify username!");
+ server.server.getLogger().log(java.util.logging.Level.WARNING, "Exception verifying " + i.getName(), ex);
@ -56,7 +55,7 @@ index acc2f0b60..0cf9d4bde 100644
}
}
@@ -169,40 +197,7 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -169,40 +196,7 @@ public class LoginListener implements PacketLoginInListener, ITickable {
return;
}
@ -98,7 +97,7 @@ index acc2f0b60..0cf9d4bde 100644
} else if (LoginListener.this.server.J()) {
LoginListener.c.warn("Failed to verify username but will let them in anyway!");
LoginListener.this.i = LoginListener.this.a(gameprofile);
@@ -242,6 +237,48 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -242,6 +236,48 @@ public class LoginListener implements PacketLoginInListener, ITickable {
}
}

10
CraftBukkit-Patches/0040-BungeeCord-Support.patch
View file

@ -1,4 +1,4 @@
From a3883ae11de748a8f4482a557fe68d93dd109a9b Mon Sep 17 00:00:00 2001
From 8c03cc5fcaf508c648a33d0fe5db1dfd44004027 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
@ -45,7 +45,7 @@ index 387d8a09f..5b784002f 100644
}
break;
diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
index 0cf9d4bde..a22f4c55e 100644
index c777c9dfd..eb936a044 100644
--- a/src/main/java/net/minecraft/server/LoginListener.java
+++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -96,9 +96,24 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@ -130,10 +130,10 @@ index 668452809..9d0e29df7 100644
if (getProfileBans().isBanned(gameprofile) && !getProfileBans().get(gameprofile).hasExpired()) {
GameProfileBanEntry gameprofilebanentry = (GameProfileBanEntry) this.k.get(gameprofile);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2ef172a4e..eb4ba4c40 100644
index 87be3a337..b27bdc7ca 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -606,7 +606,13 @@ public final class CraftServer implements Server {
@@ -607,7 +607,13 @@ public final class CraftServer implements Server {
@Override
public long getConnectionThrottle() {
@ -149,7 +149,7 @@ index 2ef172a4e..eb4ba4c40 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3ce1218a4..6290c9374 100644
index ced5f7371..06b61faab 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1581,6 +1581,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

10
CraftBukkit-Patches/0050-Improve-AutoSave-Mechanism.patch
View file

@ -1,4 +1,4 @@
From 8cbe3a8af73893827d99807cdb902dcb5eecebeb Mon Sep 17 00:00:00 2001
From d5389b05f44a1ecd02d452f29952f3b7fe0e3438 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] Improve AutoSave Mechanism
@ -24,10 +24,10 @@ index daa126825..78bfd9fe9 100644
}
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 3e719d5cd..62925a0c7 100644
index 410601d5f..287487150 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -250,7 +250,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -261,7 +261,7 @@ public class ChunkProviderServer implements IChunkProvider {
this.saveChunk(chunk);
chunk.a(false);
++i;
@ -60,10 +60,10 @@ index 0c776692b..7aa788871 100644
SpigotTimings.worldSaveTimer.stopTiming(); // Spigot
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index c6faa4bfe..1834fae6c 100644
index 08765768a..9571fac56 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -727,12 +727,17 @@ public class CraftWorld implements World {
@@ -723,12 +723,17 @@ public class CraftWorld implements World {
}
public void save() {

8
CraftBukkit-Patches/0061-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
View file

@ -1,14 +1,14 @@
From 1e650eb88661bd0d4798244476006b6080eda39c Mon Sep 17 00:00:00 2001
From 0a3fc0343ba1a53a163c698048bc1526bede34d9 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 12 Feb 2014 20:44:14 +0000
Subject: [PATCH] Allow vanilla commands to be the main version of a command
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index eb4ba4c40..36bab78d5 100644
index b27bdc7ca..a08eb7bf0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -339,8 +339,11 @@ public final class CraftServer implements Server {
@@ -340,8 +340,11 @@ public final class CraftServer implements Server {
}
if (type == PluginLoadOrder.POSTWORLD) {
@ -21,7 +21,7 @@ index eb4ba4c40..36bab78d5 100644
commandMap.registerServerAliases();
loadCustomPermissions();
DefaultPermissions.registerCorePermissions();
@@ -354,12 +357,21 @@ public final class CraftServer implements Server {
@@ -355,12 +358,21 @@ public final class CraftServer implements Server {
pluginManager.disablePlugins();
}

6
CraftBukkit-Patches/0062-Implement-Silenceable-Lightning-API.patch
View file

@ -1,4 +1,4 @@
From 8d560f4efa523d049243d3b8d252498c49a0ddf9 Mon Sep 17 00:00:00 2001
From 9f6884135341103a6294d9e49356d48ec224e4f3 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:59 -0400
Subject: [PATCH] Implement Silenceable Lightning API
@ -41,10 +41,10 @@ index e69d6cf55..afbe43dd3 100644
// this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.ENTITY_LIGHTNING_BOLT_THUNDER, SoundCategory.WEATHER, 10000.0F, 0.8F + this.random.nextFloat() * 0.2F);
float pitch = 0.8F + this.random.nextFloat() * 0.2F;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 1834fae6c..a5dd39348 100644
index 9571fac56..5dcfe744a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1590,6 +1590,22 @@ public class CraftWorld implements World {
@@ -1586,6 +1586,22 @@ public class CraftWorld implements World {
// Spigot start
private final Spigot spigot = new Spigot()
{

6
CraftBukkit-Patches/0076-Check-for-blank-OfflinePlayer-Names.patch
View file

@ -1,14 +1,14 @@
From 2cee4c3ee3278cbdfbb39234f3c198f8c8f00688 Mon Sep 17 00:00:00 2001
From 373e0dc485c95972caf27e526d7248dd36842ae2 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 14 Apr 2014 17:21:24 +1000
Subject: [PATCH] Check for blank OfflinePlayer Names
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 36bab78d5..d73ea2297 100644
index a08eb7bf0..1f3759584 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1311,6 +1311,7 @@ public final class CraftServer implements Server {
@@ -1312,6 +1312,7 @@ public final class CraftServer implements Server {
@Deprecated
public OfflinePlayer getOfflinePlayer(String name) {
Validate.notNull(name, "Name cannot be null");

6
CraftBukkit-Patches/0097-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
View file

@ -1,4 +1,4 @@
From 2cb18ab5e022d854ed3bba6ecc29f71231bb3893 Mon Sep 17 00:00:00 2001
From 3dd6ba54e56416e066eb13c92dfbd5f7b83d2ee3 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sat, 19 Jul 2014 12:49:48 +0100
Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots
@ -26,10 +26,10 @@ index 5515a30b7..4e132eabb 100644
EntityOcelot entityocelot = new EntityOcelot(this.world);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index a5dd39348..0b2a9d09d 100644
index 5dcfe744a..29a5ac639 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1211,6 +1211,12 @@ public class CraftWorld implements World {
@@ -1207,6 +1207,12 @@ public class CraftWorld implements World {
}
if (entity != null) {

6
CraftBukkit-Patches/0104-Only-fetch-an-online-UUID-in-online-mode.patch
View file

@ -1,4 +1,4 @@
From d553e016496a402123a0dfa8bf603803a49cd475 Mon Sep 17 00:00:00 2001
From 65e3186f907f339ca19472a2de0e51a4a2323048 Mon Sep 17 00:00:00 2001
From: Maxim Van de Wynckel <maxim_vdw@hotmail.com>
Date: Wed, 30 Jul 2014 01:19:51 +0200
Subject: [PATCH] Only fetch an online UUID in online mode
@ -12,10 +12,10 @@ You want to store data for player "Test" who never joined. An online UUID is cr
The player Test joins with an offline UUID but that will not match the online UUID of the saved data.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d73ea2297..5673a9858 100644
index 1f3759584..adc16e046 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1315,8 +1315,14 @@ public final class CraftServer implements Server {
@@ -1316,8 +1316,14 @@ public final class CraftServer implements Server {
OfflinePlayer result = getPlayerExact(name);
if (result == null) {

10
CraftBukkit-Patches/0114-BungeeCord-Chat-API.patch
View file

@ -1,4 +1,4 @@
From dfa2d9e28610a1d8a2e1ffddcab1993f33ef270c Mon Sep 17 00:00:00 2001
From a5604675760eba02c74aa06077c33a796a7188da Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 13 Dec 2014 03:06:05 +0100
Subject: [PATCH] BungeeCord Chat API
@ -32,10 +32,10 @@ index e55384e70..28a262835 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 5673a9858..4dc0c8fcb 100644
index adc16e046..1232ea4b2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -149,6 +149,7 @@ import org.bukkit.craftbukkit.tag.CraftBlockTag;
@@ -150,6 +150,7 @@ import org.bukkit.craftbukkit.tag.CraftBlockTag;
import org.bukkit.craftbukkit.tag.CraftItemTag;
import org.bukkit.craftbukkit.util.CraftNamespacedKey;
import org.bukkit.event.server.TabCompleteEvent;
@ -43,7 +43,7 @@ index 5673a9858..4dc0c8fcb 100644
public final class CraftServer implements Server {
private final String serverName = "CraftBukkit";
@@ -1841,6 +1842,20 @@ public final class CraftServer implements Server {
@@ -1843,6 +1844,20 @@ public final class CraftServer implements Server {
public void restart() {
org.spigotmc.RestartCommand.restart();
}
@ -108,7 +108,7 @@ index eef88cea6..72164e11a 100644
public Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index d423b8c76..0a2199b6a 100644
index 5d7f09ef4..75d56ee3b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -23,6 +23,7 @@ import java.util.UUID;

8
CraftBukkit-Patches/0122-Replace-chunk-loading-unloading-rate-throttling.patch
View file

@ -1,4 +1,4 @@
From 61cd93d7f42ebf8c3bb0a3df9b1a322fb196e8bb Mon Sep 17 00:00:00 2001
From 3a68e700dfa171668e3b6c97aae75780e501e675 Mon Sep 17 00:00:00 2001
From: Geoff Crossland <gcrossland+bukkit@gmail.com>
Date: Thu, 26 Jan 2017 20:54:55 +0000
Subject: [PATCH] Replace chunk loading / unloading rate throttling.
@ -7,10 +7,10 @@ Uses a scheme based on estimated tick slack time.
See https://hub.spigotmc.org/stash/projects/SPIGOT/repos/spigot/pull-requests/71/overview
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 62925a0c7..d35203cc5 100644
index 287487150..62d00c2f6 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -272,13 +272,22 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -283,13 +283,22 @@ public class ChunkProviderServer implements IChunkProvider {
this.chunkLoader.c();
}
@ -34,7 +34,7 @@ index 62925a0c7..d35203cc5 100644
Chunk chunk = (Chunk) this.chunks.get(olong);
if (chunk != null && chunk.d) {
@@ -288,9 +297,15 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -299,9 +308,15 @@ public class ChunkProviderServer implements IChunkProvider {
}
// CraftBukkit end

10
CraftBukkit-Patches/0124-Make-unloaded-chunk-saving-more-asynchronous.patch
View file

@ -1,14 +1,14 @@
From 5a33cfbc43fd6aa79ce4e830d3f09f0ce62d8ecc Mon Sep 17 00:00:00 2001
From f7e0d7e2eb68991eac8ed7dda32ca0e646ab7a02 Mon Sep 17 00:00:00 2001
From: Geoff Crossland <gcrossland+bukkit@gmail.com>
Date: Fri, 11 Aug 2017 19:23:58 +0100
Subject: [PATCH] Make unloaded chunk saving more asynchronous
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index d35203cc5..0296d3ef0 100644
index 62d00c2f6..00cd8d8ce 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -213,17 +213,17 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -224,17 +224,17 @@ public class ChunkProviderServer implements IChunkProvider {
public void saveChunkNOP(Chunk chunk) {
try {
@ -29,7 +29,7 @@ index d35203cc5..0296d3ef0 100644
} catch (IOException ioexception) {
ChunkProviderServer.a.error("Couldn\'t save chunk", ioexception);
} catch (ExceptionWorldConflict exceptionworldconflict) {
@@ -247,7 +247,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -258,7 +258,7 @@ public class ChunkProviderServer implements IChunkProvider {
}
if (chunk.c(flag)) {
@ -38,7 +38,7 @@ index d35203cc5..0296d3ef0 100644
chunk.a(false);
++i;
if (i == 24 && !flag && false) { // Spigot
@@ -341,7 +341,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -352,7 +352,7 @@ public class ChunkProviderServer implements IChunkProvider {
// Moved from unloadChunks above
chunk.removeEntities();
if (save) {