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

Rebuild patches

Browse source
This commit is contained in:
md_5 2020-03-08 19:40:51 +11:00
parent 8faa8b45b4
commit 6de3d4be46
22 changed files with 104 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,14 +1,14 @@
From 6d12aae1b2b57175e72212a1b9412dc2dd5ad6b5 Mon Sep 17 00:00:00 2001
From e739a167a2188b83ad37eb3d850af93f6a3c72b8 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 f43b0f0d..279236a4 100644
index a2467868..75586936 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1487,4 +1487,9 @@ public final class Bukkit {
@@ -1531,4 +1531,9 @@ public final class Bukkit {
public static UnsafeValues getUnsafe() {
return server.getUnsafe();
}
@ -19,10 +19,10 @@ index f43b0f0d..279236a4 100644
+ }
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 49906066..f79ee1c7 100644
index 266f5cb8..9f2998f6 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1251,4 +1251,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1291,4 +1291,13 @@ public interface Server extends PluginMessageRecipient {
@Deprecated
@NotNull
UnsafeValues getUnsafe();
@ -37,10 +37,10 @@ index 49906066..f79ee1c7 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index f9246bd2..e3b4ff0a 100644
index 983b6755..2434e939 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2125,6 +2125,15 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -2223,6 +2223,15 @@ public interface World extends PluginMessageRecipient, Metadatable {
@Nullable
public Location locateNearestStructure(@NotNull Location origin, @NotNull StructureType structureType, int radius, boolean findUnexplored);

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

@ -1,4 +1,4 @@
From 9984112dd6f84fa2138808179955cb61886e5473 Mon Sep 17 00:00:00 2001
From 3316480dc3e3ec46c1fca167933a5b95b24da79f 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,10 +8,10 @@ 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 279236a4..82bc43aa 100644
index 75586936..ae21e0f9 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -574,6 +574,7 @@ public final class Bukkit {
@@ -618,6 +618,7 @@ public final class Bukkit {
*/
public static void reload() {
server.reload();
@ -20,10 +20,10 @@ index 279236a4..82bc43aa 100644
/**
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index f79ee1c7..5b01e232 100644
index 9f2998f6..b8c963b9 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1255,6 +1255,10 @@ public interface Server extends PluginMessageRecipient {
@@ -1295,6 +1295,10 @@ public interface Server extends PluginMessageRecipient {
// Spigot start
public class Spigot {

6
Bukkit-Patches/0010-Silenceable-Lightning-API.patch
View file

@ -1,14 +1,14 @@
From e7dd5057ccd4dd64fd2860208c667eb458643058 Mon Sep 17 00:00:00 2001
From 1d005c133a5820254d9713910b430f398467220d Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:29 -0400
Subject: [PATCH] Silenceable Lightning API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index e3b4ff0a..14dd2d1a 100644
index 2434e939..fc633e90 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2128,6 +2128,29 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -2226,6 +2226,29 @@ public interface World extends PluginMessageRecipient, Metadatable {
// Spigot start
public class Spigot {

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

@ -1,4 +1,4 @@
From 761ec861e71af5d8860dfe030a1e9d50fc8058d9 Mon Sep 17 00:00:00 2001
From a97ea43d5a5f5a2f5c7faf0d5a80acfbd5719bf7 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
@ -285,10 +285,10 @@ index 930f109a..a0ef2a82 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 5b01e232..5a3ea7cf 100644
index b8c963b9..aba9b011 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1259,6 +1259,24 @@ public interface Server extends PluginMessageRecipient {
@@ -1299,6 +1299,24 @@ public interface Server extends PluginMessageRecipient {
public org.bukkit.configuration.file.YamlConfiguration getConfig() {
throw new UnsupportedOperationException("Not supported yet.");
}

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

@ -1,14 +1,14 @@
From d98e1dc164ee16812ad2c06f943ad6a2c84d1097 Mon Sep 17 00:00:00 2001
From 11f0e62602f3938831f5159149365bbbdc1723af 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 5a3ea7cf..83ce6a86 100644
index aba9b011..f6fb72fa 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1277,6 +1277,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1317,6 +1317,13 @@ public interface Server extends PluginMessageRecipient {
public void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");
}

6
Bukkit-Patches/0015-View-Distance.patch
View file

@ -1,4 +1,4 @@
From 06c277e2df735114049e30fa3fe6c4bdec68b0b9 Mon Sep 17 00:00:00 2001
From 81cba00cb91d7db2f116e20692c9eba2aceae197 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Tue, 30 Jul 2019 13:47:34 -0700
Subject: [PATCH] View Distance
@ -6,10 +6,10 @@ Subject: [PATCH] View Distance
This commit allows the retrieval of per world view distances.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 14dd2d1a..95e7b980 100644
index fc633e90..98331c49 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2125,6 +2125,15 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -2223,6 +2223,15 @@ public interface World extends PluginMessageRecipient, Metadatable {
@Nullable
public Location locateNearestStructure(@NotNull Location origin, @NotNull StructureType structureType, int radius, boolean findUnexplored);

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

@ -1,4 +1,4 @@
From eb789661e860a8ca18a0b68720f76afed85a6420 Mon Sep 17 00:00:00 2001
From 585aa75a6399add688fa0e4c386ad1c6ef22834a 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 8d1aba535..717e34d10 100644
index e3d5b7bd2..52ce4b649 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1907,4 +1907,14 @@ public final class CraftServer implements Server {
@@ -1929,4 +1929,14 @@ public final class CraftServer implements Server {
public UnsafeValues getUnsafe() {
return CraftMagicNumbers.INSTANCE;
}
@ -25,10 +25,10 @@ index 8d1aba535..717e34d10 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 32bcbd7b4..54f244fd9 100644
index eea897495..15deccd36 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2250,4 +2250,15 @@ public class CraftWorld implements World {
@@ -2270,4 +2270,15 @@ public class CraftWorld implements World {
PersistentRaid persistentRaid = world.getPersistentRaid();
return persistentRaid.raids.values().stream().map(CraftRaid::new).collect(Collectors.toList());
}

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

@ -1,4 +1,4 @@
From 77ed31b6abd6d05f2a16a599f80b886a3ec7e84e Mon Sep 17 00:00:00 2001
From e0b5417d1e17e95aa1c6e520811f805f00d22038 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
@ -31,18 +31,18 @@ index ed6b39dcd..1b15e3270 100644
server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.STARTUP);
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 3e9af5b42..f63c9a4ef 100644
index 0a274e209..6f05e3a3b 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -65,6 +65,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
public long ticksPerAnimalSpawns;
public long ticksPerMonsterSpawns;
@@ -67,6 +67,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
public long ticksPerWaterSpawns;
public long ticksPerAmbientSpawns;
public boolean populating;
+ public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
public CraftWorld getWorld() {
return this.world;
@@ -79,6 +80,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -81,6 +82,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
}
protected World(WorldData worlddata, DimensionManager dimensionmanager, BiFunction<World, WorldProvider, IChunkProvider> bifunction, GameProfilerFiller gameprofilerfiller, boolean flag, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env) {
@ -51,10 +51,10 @@ index 3e9af5b42..f63c9a4ef 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 717e34d10..5dce1c677 100644
index 52ce4b649..b605d0c3c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -737,6 +737,7 @@ public final class CraftServer implements Server {
@@ -747,6 +747,7 @@ public final class CraftServer implements Server {
logger.log(Level.WARNING, "Failed to load banned-players.json, " + ex.getMessage());
}
@ -62,9 +62,9 @@ index 717e34d10..5dce1c677 100644
for (WorldServer world : console.getWorlds()) {
world.worldData.setDifficulty(config.difficulty);
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
@@ -751,12 +752,14 @@ public final class CraftServer implements Server {
@@ -773,12 +774,14 @@ public final class CraftServer implements Server {
} else {
world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
world.ticksPerAmbientSpawns = this.getTicksPerAmbientSpawns();
}
+ world.spigotConfig.init(); // Spigot
}
@ -78,7 +78,7 @@ index 717e34d10..5dce1c677 100644
ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 4101ced01..766e0f6b1 100644
index 7253b1a3a..7d9a1851d 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -121,6 +121,14 @@ public class Main {

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

@ -1,4 +1,4 @@
From 314174529eea7a9b2c1a45378f6c6bf16543960a Mon Sep 17 00:00:00 2001
From 144a1f0af3032223005ed82a8d9096c8ae55e9db 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
@ -113,10 +113,10 @@ index 26248d91c..bbe5a08f2 100644
this.entitiesToAdd.add(entity);
} else {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 5dce1c677..19d5efe90 100644
index b605d0c3c..6771f90c3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -688,6 +688,7 @@ public final class CraftServer implements Server {
@@ -698,6 +698,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");
@ -125,7 +125,7 @@ index 5dce1c677..19d5efe90 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 54f244fd9..42a35b859 100644
index 15deccd36..a7cc7ffe1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -375,6 +375,7 @@ public class CraftWorld implements World {

6
CraftBukkit-Patches/0008-View-Distance.patch
View file

@ -1,4 +1,4 @@
From ebfcf74e8edb8201f4fb77994d1dcc6df911ef46 Mon Sep 17 00:00:00 2001
From 1fb30c1c776ae028460a43c205df952fc375dd23 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:52:41 +1100
Subject: [PATCH] View Distance
@ -41,10 +41,10 @@ index bbe5a08f2..9fc569a14 100644
});
// CraftBukkit end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 42a35b859..eb8e110e4 100644
index a7cc7ffe1..b0cee6ebd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2257,6 +2257,13 @@ public class CraftWorld implements World {
@@ -2277,6 +2277,13 @@ public class CraftWorld implements World {
return persistentRaid.raids.values().stream().map(CraftRaid::new).collect(Collectors.toList());
}

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

@ -1,4 +1,4 @@
From d1e92a2dc7ef9633ae6ae3c6ace7a363b0547bd8 Mon Sep 17 00:00:00 2001
From 11e1a4936401bf6fe09f92aaec70ee43283881b8 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 39d6b64b0..b3681ed0a 100644
index 63e991695..27a94fc46 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -102,9 +102,11 @@ public class ChunkProviderServer extends IChunkProvider {
@ -38,7 +38,7 @@ index 39d6b64b0..b3681ed0a 100644
this.world.getMethodProfiler().exit();
this.clearCache();
}
@@ -375,6 +381,7 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -381,6 +387,7 @@ public class ChunkProviderServer extends IChunkProvider {
chunk.setInhabitedTime(chunk.getInhabitedTime() + j);
if (flag1 && (this.allowMonsters || this.allowAnimals) && this.world.getWorldBorder().isInBounds(chunk.getPos())) {
this.world.getMethodProfiler().enter("spawner");
@ -46,7 +46,7 @@ index 39d6b64b0..b3681ed0a 100644
EnumCreatureType[] aenumcreaturetype1 = aenumcreaturetype;
int i1 = aenumcreaturetype.length;
@@ -412,10 +419,13 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -423,10 +430,13 @@ public class ChunkProviderServer extends IChunkProvider {
}
}
@ -60,7 +60,7 @@ index 39d6b64b0..b3681ed0a 100644
}
}
});
@@ -428,7 +438,9 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -439,7 +449,9 @@ public class ChunkProviderServer extends IChunkProvider {
this.world.getMethodProfiler().exit();
}
@ -409,7 +409,7 @@ index 68e220bef..b7175ee6a 100644
private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
public CraftPersistentDataContainer persistentDataContainer;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index f63c9a4ef..c250be53d 100644
index 6f05e3a3b..71bf7a0cc 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -18,6 +18,7 @@ import org.apache.logging.log4j.util.Supplier;
@ -420,7 +420,7 @@ index f63c9a4ef..c250be53d 100644
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.block.CapturedBlockState;
@@ -67,6 +68,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -69,6 +70,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
public boolean populating;
public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
@ -429,7 +429,7 @@ index f63c9a4ef..c250be53d 100644
public CraftWorld getWorld() {
return this.world;
}
@@ -123,6 +126,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -127,6 +130,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
public void c(WorldBorder worldborder, double d0) {}
});
// CraftBukkit end
@ -437,7 +437,7 @@ index f63c9a4ef..c250be53d 100644
}
@Override
@@ -555,6 +559,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -559,6 +563,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
GameProfilerFiller gameprofilerfiller = this.getMethodProfiler();
gameprofilerfiller.enter("blockEntities");
@ -445,7 +445,7 @@ index f63c9a4ef..c250be53d 100644
if (!this.tileEntityListUnload.isEmpty()) {
this.tileEntityListTick.removeAll(this.tileEntityListUnload);
this.tileEntityList.removeAll(this.tileEntityListUnload);
@@ -575,6 +580,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -579,6 +584,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
gameprofilerfiller.a(() -> {
return String.valueOf(TileEntityTypes.a(tileentity.getTileType()));
});
@ -453,7 +453,7 @@ index f63c9a4ef..c250be53d 100644
if (tileentity.getTileType().isValidBlock(this.getType(blockposition).getBlock())) {
((ITickable) tileentity).tick();
} else {
@@ -589,6 +595,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -593,6 +599,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
tileentity.a(crashreportsystemdetails);
throw new ReportedException(crashreport);
}
@ -465,7 +465,7 @@ index f63c9a4ef..c250be53d 100644
}
}
@@ -601,6 +612,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -605,6 +616,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
}
}
@ -474,7 +474,7 @@ index f63c9a4ef..c250be53d 100644
this.tickingTileEntities = false;
gameprofilerfiller.exitEnter("pendingBlockEntities");
if (!this.tileEntityListPending.isEmpty()) {
@@ -633,12 +646,15 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -637,12 +650,15 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
this.tileEntityListPending.clear();
}
@ -574,10 +574,10 @@ index 9fc569a14..30a5342ce 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 19d5efe90..97e843009 100644
index 6771f90c3..9c958eee5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1915,6 +1915,11 @@ public final class CraftServer implements Server {
@@ -1937,6 +1937,11 @@ public final class CraftServer implements Server {
private final Spigot spigot = new Spigot()
{

8
CraftBukkit-Patches/0010-Fix-Mob-Spawning-Relative-to-View-Distance.patch
View file

@ -1,4 +1,4 @@
From 73f3dedb60d2b5b82ca98fee67a8d1718f60b8b0 Mon Sep 17 00:00:00 2001
From 7d18ef8beaee2e198f4be314956683cca04bda4b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 17:29:54 +1000
Subject: [PATCH] Fix Mob Spawning Relative to View Distance
@ -8,10 +8,10 @@ Changes the mob spawning algorithm to properly account for view distance and the
Needs better documentation.
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 6b1a1c2bb..e8b7cc06c 100644
index 27a94fc46..41eac3588 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -379,7 +379,7 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -385,7 +385,7 @@ public class ChunkProviderServer extends IChunkProvider {
if (!this.playerChunkMap.isOutsideOfRange(chunkcoordintpair)) {
chunk.setInhabitedTime(chunk.getInhabitedTime() + j);
@ -21,7 +21,7 @@ index 6b1a1c2bb..e8b7cc06c 100644
this.world.timings.mobSpawn.startTiming(); // Spigot
EnumCreatureType[] aenumcreaturetype1 = aenumcreaturetype;
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index b2486dc47..ccb22fdcc 100644
index 381738798..30b2b2c47 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -820,10 +820,21 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {

6
CraftBukkit-Patches/0011-Handle-Null-Tile-Entities.patch
View file

@ -1,14 +1,14 @@
From d36aed3c84df4b4c6d4ebe117707f417048fda4f Mon Sep 17 00:00:00 2001
From 0736df2b262be27353d5a398ad9f6165222bf574 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 c250be53d..6c49377a9 100644
index 71bf7a0cc..60638b768 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -571,6 +571,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -575,6 +575,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
while (iterator.hasNext()) {
TileEntity tileentity = (TileEntity) iterator.next();

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

@ -1,4 +1,4 @@
From 2d9a8a86ffa081f882477daf790932ec3715710e Mon Sep 17 00:00:00 2001
From 8694554c5fb0d81d5f6a30622e7f67a76fb6d5ed 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 37df72320..37b1a7947 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 97e843009..779fdf593 100644
index 9c958eee5..31f73000f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1614,6 +1614,13 @@ public final class CraftServer implements Server {
@@ -1636,6 +1636,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 b373356ba5fa45934a848adb27c7533125ec1bae Mon Sep 17 00:00:00 2001
From e2ef9b32f024751ef4c78a5916e6c6dbcb6f9763 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 b97e1f30a..c20fcd777 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 779fdf593..85b14ca16 100644
index 31f73000f..89ab05a9d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -694,11 +694,11 @@ public final class CraftServer implements Server {
@@ -704,11 +704,11 @@ public final class CraftServer implements Server {
return true;
}

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

@ -1,4 +1,4 @@
From 5dff1f3c9b2328630fac5461d8f4c7a2922ea665 Mon Sep 17 00:00:00 2001
From 808cfb21d718be8e31d038aa103c5240e72e6987 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 493aa24c4..ba13b1723 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 85b14ca16..1c6f79389 100644
index 89ab05a9d..7ed9e9579 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1581,7 +1581,7 @@ public final class CraftServer implements Server {
@@ -1603,7 +1603,7 @@ public final class CraftServer implements Server {
@Override
public boolean isPrimaryThread() {
@ -50,7 +50,7 @@ index 85b14ca16..1c6f79389 100644
}
@Override
@@ -1927,6 +1927,11 @@ public final class CraftServer implements Server {
@@ -1949,6 +1949,11 @@ public final class CraftServer implements Server {
{
return org.spigotmc.SpigotConfig.config;
}

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

@ -1,4 +1,4 @@
From c58e2f8a0f0912bc0a45c65ea43e3d5a9e4d0e4d Mon Sep 17 00:00:00 2001
From 935401f015fe5a6abea820b557cc498fb03b5c90 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 c074d7a40..7c518983a 100644
// this.world.playSound((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 eb8e110e4..5b03ff709 100644
index b0cee6ebd..621920603 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2267,6 +2267,22 @@ public class CraftWorld implements World {
@@ -2287,6 +2287,22 @@ public class CraftWorld implements World {
// Spigot start
private final Spigot spigot = new Spigot()
{

10
CraftBukkit-Patches/0065-Prevent-NoClassDefError-crash-and-notify-on-crash.patch
View file

@ -1,14 +1,14 @@
From 0e591b0758a05291bbff7bf3ffcce6dc0c2e3994 Mon Sep 17 00:00:00 2001
From 2abffa7f63133c2a74d8c7f7c53bbd0a8431f98f Mon Sep 17 00:00:00 2001
From: David <dmck2b@gmail.com>
Date: Mon, 21 Apr 2014 12:43:08 +0100
Subject: [PATCH] Prevent NoClassDefError crash and notify on crash
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 6c49377a9..4613d8b67 100644
index 60638b768..e1ee98c2d 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -69,6 +69,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -71,6 +71,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
public final SpigotTimings.WorldTimingsHandler timings; // Spigot
@ -16,7 +16,7 @@ index 6c49377a9..4613d8b67 100644
public CraftWorld getWorld() {
return this.world;
@@ -259,7 +260,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -263,7 +264,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
// CraftBukkit start
if (!this.captureBlockStates) { // Don't notify clients or update physics while capturing blockstates
// Modularize client and physic updates
@ -31,7 +31,7 @@ index 6c49377a9..4613d8b67 100644
}
// CraftBukkit end
@@ -416,6 +423,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -420,6 +427,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
}
// CraftBukkit end
iblockdata.doPhysics(this, blockposition, block, blockposition1, false);

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

@ -1,4 +1,4 @@
From 8d6ba661f1ccda6b2a557cc6ba48d46e34e69e4e Mon Sep 17 00:00:00 2001
From 2a1b618679ec9ff11b34e5119a3db8d0a27cbabe 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 6ad4adaf0..84a2f33cc 100644
index cf8e3b95a..1300f7b73 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1334,8 +1334,14 @@ public final class CraftServer implements Server {
@@ -1356,8 +1356,14 @@ public final class CraftServer implements Server {
OfflinePlayer result = getPlayerExact(name);
if (result == null) {

8
CraftBukkit-Patches/0087-Limit-TNT-Detonations-per-tick.patch
View file

@ -1,4 +1,4 @@
From 7b4a60e547b9fb5159c8bc110d836c79e397c8be Mon Sep 17 00:00:00 2001
From 715ac644b3c1929647b6b19c95f47be048b36056 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 20 Aug 2014 18:12:32 -0400
Subject: [PATCH] Limit TNT Detonations per tick
@ -19,10 +19,10 @@ index ec238b051..d04212436 100644
this.setMot(this.getMot().add(0.0D, -0.04D, 0.0D));
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 4613d8b67..ce3af4471 100644
index e1ee98c2d..fc7ee00f4 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -666,6 +666,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -670,6 +670,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
timings.tileEntityPending.stopTiming(); // Spigot
gameprofilerfiller.exit();
@ -31,7 +31,7 @@ index 4613d8b67..ce3af4471 100644
public void a(Consumer<Entity> consumer, Entity entity) {
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 7eada4dfa..291f0cfec 100644
index 03203f220..df26a350e 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -314,4 +314,15 @@ public class SpigotWorldConfig

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

@ -1,4 +1,4 @@
From e88500debe53c94516d4a47892f4f0b0e11d28f4 Mon Sep 17 00:00:00 2001
From 5695bed76c70e2ce3979323d27954c0dd48a2ab7 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 84a2f33cc..5a6142eb7 100644
index 1300f7b73..02364e3c3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -196,6 +196,8 @@ import org.yaml.snakeyaml.Yaml;
@ -44,7 +44,7 @@ index 84a2f33cc..5a6142eb7 100644
public final class CraftServer implements Server {
private final String serverName = "CraftBukkit";
private final String serverVersion;
@@ -1956,6 +1958,20 @@ public final class CraftServer implements Server {
@@ -1978,6 +1980,20 @@ public final class CraftServer implements Server {
public void restart() {
org.spigotmc.RestartCommand.restart();
}

14
CraftBukkit-Patches/0090-Allow-Capping-Tile-Entity-Tick-Time.patch
View file

@ -1,4 +1,4 @@
From 7f617012718c9c7f88cd2f3bbfd201915161f596 Mon Sep 17 00:00:00 2001
From 818871cfacd1fbaa36c7926b24b7fc6b6ae9cf28 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 20 Feb 2015 21:39:31 +1100
Subject: [PATCH] Allow Capping (Tile)Entity Tick Time.
@ -10,10 +10,10 @@ For tiles there is very little tradeoff for this option, as tile ticks are based
This feature was commisioned by Chunkr.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index ce3af4471..cdd254a7e 100644
index fc7ee00f4..487346ce8 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -70,6 +70,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -72,6 +72,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
public final SpigotTimings.WorldTimingsHandler timings; // Spigot
public static BlockPosition lastPhysicsProblem; // Spigot
@ -23,7 +23,7 @@ index ce3af4471..cdd254a7e 100644
public CraftWorld getWorld() {
return this.world;
@@ -128,6 +131,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -132,6 +135,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
});
// CraftBukkit end
timings = new SpigotTimings.WorldTimingsHandler(this); // Spigot - code below can generate new world and access timings
@ -32,7 +32,7 @@ index ce3af4471..cdd254a7e 100644
}
@Override
@@ -578,14 +583,19 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -582,14 +587,19 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
}
this.tickingTileEntities = true;
@ -57,7 +57,7 @@ index ce3af4471..cdd254a7e 100644
continue;
}
// Spigot end
@@ -622,7 +632,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -626,7 +636,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
}
if (tileentity.isRemoved()) {
@ -70,7 +70,7 @@ index ce3af4471..cdd254a7e 100644
if (this.isLoaded(tileentity.getPosition())) {
this.getChunkAtWorldCoords(tileentity.getPosition()).removeTileEntity(tileentity.getPosition());
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index aa6c7124c..3e96bd11c 100644
index 3b0e86096..9cad3c261 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -331,4 +331,13 @@ public class SpigotWorldConfig