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

Rebuild patches

Browse source
This commit is contained in:
md_5 2019-07-03 10:30:37 +10:00
parent 935adb34f0
commit d05d3c1f87
12 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 2b2b399eb1f17ee334cb3bac13d393a5c13b26a2 Mon Sep 17 00:00:00 2001
From e0606cb598b1f1b4d18913f7963d7398458ec8ca 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 a6a6fba26..0b6a1596a 100644
index 14aa8ad55..a5254c748 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1882,4 +1882,14 @@ public final class CraftServer implements Server {
@@ -1887,4 +1887,14 @@ public final class CraftServer implements Server {
public UnsafeValues getUnsafe() {
return CraftMagicNumbers.INSTANCE;
}

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

@ -1,4 +1,4 @@
From 02200c5af94d75fefb97ff828dcc250694b410f2 Mon Sep 17 00:00:00 2001
From c7c16d46c72248260e263f91cf7283b3c82cf453 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 406a35970..3c4e09426 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 0b6a1596a..c8987389b 100644
index a5254c748..21b901474 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -729,6 +729,7 @@ public final class CraftServer implements Server {
@@ -734,6 +734,7 @@ public final class CraftServer implements Server {
logger.log(Level.WARNING, "Failed to load banned-players.json, " + ex.getMessage());
}
@ -62,7 +62,7 @@ index 0b6a1596a..c8987389b 100644
for (WorldServer world : console.getWorlds()) {
world.worldData.setDifficulty(config.difficulty);
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
@@ -743,12 +744,14 @@ public final class CraftServer implements Server {
@@ -748,12 +749,14 @@ public final class CraftServer implements Server {
} else {
world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
}

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

@ -1,4 +1,4 @@
From d4cadafd04eed96eb4ad57114ff98fcfccf2ad50 Mon Sep 17 00:00:00 2001
From 2f63ab55fb3975464e9af59ef61e50f3cf165cbc 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
@ -105,10 +105,10 @@ index fea9736b6..52f05f1f7 100644
throw new IllegalStateException("Removing entity while ticking!");
} else {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c8987389b..f2818157e 100644
index 21b901474..37cd0d7b5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -682,6 +682,7 @@ public final class CraftServer implements Server {
@@ -685,6 +685,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");

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

@ -1,4 +1,4 @@
From 1732c86ae1553d9b0859611bf86e61dc5bd9d7b8 Mon Sep 17 00:00:00 2001
From fbc8035627189c73975915326ddfa93fcb199b0b 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
@ -128,7 +128,7 @@ index bc7c4e0ad..7b9586ed0 100644
@Override
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 67d99d7f7..e5fc177d7 100644
index 638c2feb9..47abdd250 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -29,6 +29,7 @@ import org.bukkit.command.CommandSender;
@ -389,7 +389,7 @@ index 7f2967a5f..a1ae37d22 100644
// this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s);
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index fac765a38..4759cea26 100644
index 6e143cad3..86890dadd 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -9,9 +9,11 @@ import org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer;
@ -403,7 +403,7 @@ index fac765a38..4759cea26 100644
+ public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getTileEntityTimings(this); // Spigot
// CraftBukkit start - data containers
private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
public final CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(DATA_TYPE_REGISTRY);
public CraftPersistentDataContainer persistentDataContainer;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 3c4e09426..031c24bf7 100644
--- a/src/main/java/net/minecraft/server/World.java
@ -579,10 +579,10 @@ index b71cc720a..03b576c4a 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f2818157e..c0dc684c6 100644
index 37cd0d7b5..e6f8badb1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1890,6 +1890,11 @@ public final class CraftServer implements Server {
@@ -1895,6 +1895,11 @@ public final class CraftServer implements Server {
private final Spigot spigot = new Spigot()
{

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

@ -1,4 +1,4 @@
From 9724b95aa947da9051f53f7d4de876ca445e03f7 Mon Sep 17 00:00:00 2001
From 5748f4306250c519818fa7a3b1112a1b1d8fe2c4 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 9598f07ee..686878fb0 100644
if (commandnode2.canUse(commandlistenerwrapper)) {
ArgumentBuilder argumentbuilder = commandnode2.createBuilder(); // CraftBukkit - decompile error
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c0dc684c6..b56d9f48c 100644
index e6f8badb1..fb753cc77 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1589,6 +1589,13 @@ public final class CraftServer implements Server {
@@ -1594,6 +1594,13 @@ public final class CraftServer implements Server {
}
public List<String> tabCompleteCommand(Player player, String message, WorldServer world, Vec3D pos) {

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

@ -1,4 +1,4 @@
From 590badeab86d7717670b9c88d5231ea4a6e2331c Mon Sep 17 00:00:00 2001
From de18a9da7bc8d83b0055e4c1b43d16584b00232d 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 6a6cd9471..fe7b2bd32 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b56d9f48c..62e15150c 100644
index fb753cc77..aaf870734 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -688,11 +688,11 @@ public final class CraftServer implements Server {
@@ -691,11 +691,11 @@ public final class CraftServer implements Server {
return true;
}

8
CraftBukkit-Patches/0031-Watchdog-Thread.patch
View file

@ -1,4 +1,4 @@
From 3e610906e9dcc813322df7bad17cb1c06b389a11 Mon Sep 17 00:00:00 2001
From 6f638328a19acd69a58a82f0190533ba7c348133 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 b01191458..ed5ec9bab 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 62e15150c..502cc0eb7 100644
index aaf870734..d8a445d11 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1556,7 +1556,7 @@ public final class CraftServer implements Server {
@@ -1561,7 +1561,7 @@ public final class CraftServer implements Server {
@Override
public boolean isPrimaryThread() {
@ -50,7 +50,7 @@ index 62e15150c..502cc0eb7 100644
}
@Override
@@ -1902,6 +1902,11 @@ public final class CraftServer implements Server {
@@ -1907,6 +1907,11 @@ public final class CraftServer implements Server {
{
return org.spigotmc.SpigotConfig.config;
}

6
CraftBukkit-Patches/0034-BungeeCord-Support.patch
View file

@ -1,4 +1,4 @@
From dc9fad4141b246de037a53186aac2722bd36d122 Mon Sep 17 00:00:00 2001
From 2f78c4ba856cbf4919aaebe2abb95b15095972e9 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
@ -128,10 +128,10 @@ index e55aff329..b57d408bb 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 502cc0eb7..804641cfb 100644
index d8a445d11..166a667a0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -620,7 +620,13 @@ public final class CraftServer implements Server {
@@ -623,7 +623,13 @@ public final class CraftServer implements Server {
@Override
public long getConnectionThrottle() {

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

@ -1,14 +1,14 @@
From b29684e7124695128871d23b7ea22deef63d2ed3 Mon Sep 17 00:00:00 2001
From 2a6ca1da1c07b8d809d95ab165f1a24e31dc0940 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 804641cfb..ac9c10f85 100644
index 166a667a0..4b600121a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -372,8 +372,11 @@ public final class CraftServer implements Server {
@@ -375,8 +375,11 @@ public final class CraftServer implements Server {
}
if (type == PluginLoadOrder.POSTWORLD) {
@ -21,7 +21,7 @@ index 804641cfb..ac9c10f85 100644
commandMap.registerServerAliases();
DefaultPermissions.registerCorePermissions();
CraftDefaultPermissions.registerCorePermissions();
@@ -387,12 +390,21 @@ public final class CraftServer implements Server {
@@ -390,12 +393,21 @@ public final class CraftServer implements Server {
pluginManager.disablePlugins();
}

6
CraftBukkit-Patches/0066-Log-null-TileEntity-Owner.patch
View file

@ -1,14 +1,14 @@
From cf7655ab4f58ecd0025448c18e403a5beaec4276 Mon Sep 17 00:00:00 2001
From 43f1ae38fed52b11b2f5cbd45dd508cb76514fb7 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 20 Apr 2014 11:16:54 +1000
Subject: [PATCH] Log null TileEntity Owner
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index 4759cea26..5b0153352 100644
index 86890dadd..33dec830e 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -202,7 +202,14 @@ public abstract class TileEntity {
@@ -196,7 +196,14 @@ public abstract class TileEntity {
// CraftBukkit start - add method
public InventoryHolder getOwner() {
if (world == null) return null;

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

@ -1,4 +1,4 @@
From 27559fc62a12ff40e24d2c199e0b700100cd331e Mon Sep 17 00:00:00 2001
From cb16250825dd27e7e9052fd7e5a78731a260e7ec 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 ac9c10f85..714d64f2b 100644
index 4b600121a..369bf054b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1309,8 +1309,14 @@ public final class CraftServer implements Server {
@@ -1314,8 +1314,14 @@ public final class CraftServer implements Server {
OfflinePlayer result = getPlayerExact(name);
if (result == null) {

6
CraftBukkit-Patches/0095-BungeeCord-Chat-API.patch
View file

@ -1,4 +1,4 @@
From 6538c2e93c67ccb860c915237b6f7ae01aa4b9fa Mon Sep 17 00:00:00 2001
From 3a58038b7d1ccb34be32c759f566734084063787 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,7 +32,7 @@ index 417c26775..fa4eab5b0 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 714d64f2b..88dc0ab2e 100644
index 369bf054b..6e4b23b7d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -193,6 +193,8 @@ import org.yaml.snakeyaml.Yaml;
@ -44,7 +44,7 @@ index 714d64f2b..88dc0ab2e 100644
public final class CraftServer implements Server {
private final String serverName = "CraftBukkit";
private final String serverVersion;
@@ -1931,6 +1933,20 @@ public final class CraftServer implements Server {
@@ -1936,6 +1938,20 @@ public final class CraftServer implements Server {
public void restart() {
org.spigotmc.RestartCommand.restart();
}