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 2020-07-03 09:58:39 +10:00
parent 4d9262cf9f
commit beb7d47c1d
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
17 changed files with 70 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 6cf9502cb4e5ca34f974ad8bfadb7f96d040cf10 Mon Sep 17 00:00:00 2001
From 9fca26d62549a31bca66c4aaefd84918bd999e92 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 aa2dd9569..63a06aa8d 100644
index 20a44e008..e803cb48f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2004,4 +2004,14 @@ public final class CraftServer implements Server {
@@ -2008,4 +2008,14 @@ public final class CraftServer implements Server {
public UnsafeValues getUnsafe() {
return CraftMagicNumbers.INSTANCE;
}
@ -122,10 +122,10 @@ index 6c05cb414..e7e7d738e 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 727906838..68c775b0b 100644
index 6ee141c68..b5460d7c7 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1677,4 +1677,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1698,4 +1698,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().openBook(org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(book), net.minecraft.server.EnumHand.MAIN_HAND);
getInventory().setItemInMainHand(hand);
}

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

@ -1,4 +1,4 @@
From 41a401fa5e62d800afc06284dc43a8251dcdb014 Mon Sep 17 00:00:00 2001
From 0c4105f7d9d34e928ceba9d07dc1ea96b6adb233 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 a8277089f..7e9c22351 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 b0526d31a..d0e13c9a3 100644
index e803cb48f..f38b3b730 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -779,6 +779,7 @@ public final class CraftServer implements Server {
@@ -781,6 +781,7 @@ public final class CraftServer implements Server {
logger.log(Level.WARNING, "Failed to load banned-players.json, " + ex.getMessage());
}
@ -62,7 +62,7 @@ index b0526d31a..d0e13c9a3 100644
for (WorldServer world : console.getWorlds()) {
world.worldDataServer.setDifficulty(config.difficulty);
world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
@@ -811,12 +812,14 @@ public final class CraftServer implements Server {
@@ -813,12 +814,14 @@ public final class CraftServer implements Server {
} else {
world.ticksPerAmbientSpawns = this.getTicksPerAmbientSpawns();
}
@ -78,7 +78,7 @@ index b0526d31a..d0e13c9a3 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 e0161c484..b75bed089 100644
index d1c2fe153..4ac80c20b 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 {

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

@ -1,4 +1,4 @@
From 11d6feee72b81adb3d4b5d928196fd386538cfb2 Mon Sep 17 00:00:00 2001
From 64edc8e91f85896cbfe108de07543cf00dafce58 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 a88da8054..a4dd7619a 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 01ecbb92f..4b18380d3 100644
index f38b3b730..bece2703f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -730,6 +730,7 @@ public final class CraftServer implements Server {
@@ -732,6 +732,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");
@ -189,10 +189,10 @@ index dc9dbbf88..a48ea7d7c 100644
List<org.bukkit.entity.Entity> bukkitEntityList = new java.util.ArrayList<org.bukkit.entity.Entity>(notchEntityList.size());
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 68c775b0b..212562d60 100644
index b5460d7c7..c3e329d8b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -302,6 +302,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -304,6 +304,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void kickPlayer(String message) {

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

@ -1,4 +1,4 @@
From 66b2b7fd11ef07516ad3a8c7e47bd6c9826d5a4c Mon Sep 17 00:00:00 2001
From 4ffcb1726431c03d9a6c0fa06950a3e390e1d9e7 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
@ -336,7 +336,7 @@ index a9aab0008..0c8d1b2ae 100644
this.methodProfiler.exit();
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index ec314edb7..505a78a74 100644
index 18f6862d7..71e30ab2b 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -134,6 +134,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@ -579,10 +579,10 @@ index d992df3ae..b81824edf 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 4b18380d3..04bbb07a9 100644
index bece2703f..1f42a82a1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2012,6 +2012,11 @@ public final class CraftServer implements Server {
@@ -2016,6 +2016,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 3ff3d722d139ac3db400ebb2e2e8ed3e480d0075 Mon Sep 17 00:00:00 2001
From 287d6d4dec7bb06ee1d658c5396a36695d26449d 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 345fe262d..e6030512d 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 e39de2e4b..b316972fb 100644
index 1f42a82a1..d42810f88 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1711,6 +1711,13 @@ public final class CraftServer implements Server {
@@ -1715,6 +1715,13 @@ public final class CraftServer implements Server {
}
public List<String> tabCompleteCommand(Player player, String message, WorldServer world, Vec3D pos) {

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

@ -1,4 +1,4 @@
From a01e5cb0d3bea0002804e0b6dd7a817ae2dc2078 Mon Sep 17 00:00:00 2001
From 88be6f139587f25d48830fab5f4e52f64e0fcdd7 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
@ -23,7 +23,7 @@ index 2052f9f2f..414ba0650 100644
this.c.close(chatmessage);
} else {
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 54a407603..9e3f162ac 100644
index 7f7b3ce79..d5762f002 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -505,7 +505,7 @@ public abstract class PlayerList {
@ -45,10 +45,10 @@ index 54a407603..9e3f162ac 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7f8978321..351fe76f8 100644
index d42810f88..f804c9ebf 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -736,11 +736,11 @@ public final class CraftServer implements Server {
@@ -738,11 +738,11 @@ public final class CraftServer implements Server {
return true;
}

6
CraftBukkit-Patches/0024-Prevent-Ghost-Players-Caused-by-Plugins.patch
View file

@ -1,4 +1,4 @@
From 8ef8e27070f568fb4c00798f9d3fb38cada9731d Mon Sep 17 00:00:00 2001
From d72843f5cc9c0386acec22790bb71e5a7d0c5676 Mon Sep 17 00:00:00 2001
From: Alex Ciuba <alexciuba@gmail.com>
Date: Tue, 11 Jun 2013 15:23:03 -0400
Subject: [PATCH] Prevent Ghost Players Caused by Plugins
@ -6,12 +6,12 @@ Subject: [PATCH] Prevent Ghost Players Caused by Plugins
Check if the player is still connected after firing event. Fixes BUKKIT-4327
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index b12851794..fd7c8273a 100644
index d5762f002..a02a9a620 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -660,6 +660,11 @@ public abstract class PlayerList {
Player respawnPlayer = cserver.getPlayer(entityplayer1);
PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn);
PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn && !flag2, flag2);
cserver.getPluginManager().callEvent(respawnEvent);
+ // Spigot Start
+ if (entityplayer.playerConnection.isDisconnected()) {

6
CraftBukkit-Patches/0025-Player-Collision-API.patch
View file

@ -1,14 +1,14 @@
From 5c1be6a56aeda6ec331a2bc33b886907249d7012 Mon Sep 17 00:00:00 2001
From ee47d47f06a1a7b80bb7ecc4d976da249169ae6d Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 27 Mar 2016 20:35:09 +1100
Subject: [PATCH] Player Collision API
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 212562d60..ac559d703 100644
index c3e329d8b..09011c962 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1682,6 +1682,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1703,6 +1703,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Spigot start
private final Player.Spigot spigot = new Player.Spigot()
{

6
CraftBukkit-Patches/0028-Implement-respawn-API.patch
View file

@ -1,14 +1,14 @@
From 626ca9a47d9e1b773f2eda1b4f655cc8f4d9a3da Mon Sep 17 00:00:00 2001
From 3f4af9af7515d25bb1d1cda8af137262b7f13d8b 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 ac559d703..0c9b88fee 100644
index 09011c962..28a3560e9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1692,6 +1692,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1713,6 +1713,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setCollidesWithEntities(boolean collides) {
CraftPlayer.this.setCollidable(collides);
}

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

@ -1,4 +1,4 @@
From 6b899ccc31f887b73e3b469362aef1a496c419e8 Mon Sep 17 00:00:00 2001
From 08ca7b9d198f2acf26b8e60647d2b5ad94db9921 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.
@ -18,7 +18,7 @@ index c78e6c21d..f93c04888 100644
thread1.setUncaughtExceptionHandler(new ThreadNamedUncaughtExceptionHandler(DedicatedServer.LOGGER));
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 48e432eb3..e99caff7d 100644
index 30b5bd345..4bbb7f70c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -850,6 +850,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@ -38,10 +38,10 @@ index 48e432eb3..e99caff7d 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 ec4d70f68..a3319450d 100644
index f804c9ebf..799c3cd48 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1678,7 +1678,7 @@ public final class CraftServer implements Server {
@@ -1682,7 +1682,7 @@ public final class CraftServer implements Server {
@Override
public boolean isPrimaryThread() {
@ -50,7 +50,7 @@ index ec4d70f68..a3319450d 100644
}
@Override
@@ -2024,6 +2024,11 @@ public final class CraftServer implements Server {
@@ -2028,6 +2028,11 @@ public final class CraftServer implements Server {
{
return org.spigotmc.SpigotConfig.config;
}

14
CraftBukkit-Patches/0033-BungeeCord-Support.patch
View file

@ -1,4 +1,4 @@
From d45501f68ab73ef6dcbedaaee01ecffc8ad8b653 Mon Sep 17 00:00:00 2001
From 802f1dedd67b982f761b1aaa667aed46e1932ab4 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 c25888b69..bb54632f5 100644
index 414ba0650..ba4e31771 100644
--- a/src/main/java/net/minecraft/server/HandshakeListener.java
+++ b/src/main/java/net/minecraft/server/HandshakeListener.java
@@ -7,6 +7,7 @@ import java.util.HashMap;
@ -115,7 +115,7 @@ index 6aeea22ae..4f008e472 100644
this.d = EnumProtocol.a(packetdataserializer.i());
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index fd7c8273a..93dc41f90 100644
index a02a9a620..49557db47 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -491,7 +491,7 @@ public abstract class PlayerList {
@ -128,10 +128,10 @@ index fd7c8273a..93dc41f90 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 5afd4507b..0e8bce923 100644
index 799c3cd48..8f7023f72 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -653,7 +653,13 @@ public final class CraftServer implements Server {
@@ -655,7 +655,13 @@ public final class CraftServer implements Server {
@Override
public long getConnectionThrottle() {
@ -147,10 +147,10 @@ index 5afd4507b..0e8bce923 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 0c9b88fee..61e4f8a44 100644
index 28a3560e9..fcdb5de66 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1683,6 +1683,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1704,6 +1704,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
private final Player.Spigot spigot = new Player.Spigot()
{

6
CraftBukkit-Patches/0039-Disable-Connected-Check-on-setScoreboard.patch
View file

@ -1,14 +1,14 @@
From ec79fdf2dbca72414cff86d546d371a3bcf433ed Mon Sep 17 00:00:00 2001
From a1bda2f48ed42b187773edaf010cc2870f3d3832 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 61e4f8a44..8b88fa1ac 100644
index fcdb5de66..869a8ebda 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1451,7 +1451,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1472,7 +1472,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
throw new IllegalStateException("Cannot set scoreboard yet");
}
if (playerConnection.isDisconnected()) {

6
CraftBukkit-Patches/0049-Add-support-for-fetching-hidden-players.patch
View file

@ -1,14 +1,14 @@
From 3c343df2668ac657aef8340343b45383492cc8a9 Mon Sep 17 00:00:00 2001
From 604e2972f12c9985f1f126a9df10174f21df5453 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 8b88fa1ac..ba373cad0 100644
index 869a8ebda..94d7bd8d7 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1707,6 +1707,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1728,6 +1728,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
server.getServer().getPlayerList().moveToWorld( getHandle(), false );
}
}

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

@ -1,14 +1,14 @@
From 4a47a38e301e3c6381093ddec0cfd67960f7f3e6 Mon Sep 17 00:00:00 2001
From b2317c660854a4fc2d8ba6d5929ee858d041d8a5 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 0e8bce923..a51a0d6b5 100644
index 8f7023f72..981282015 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -405,8 +405,11 @@ public final class CraftServer implements Server {
@@ -407,8 +407,11 @@ public final class CraftServer implements Server {
}
if (type == PluginLoadOrder.POSTWORLD) {
@ -21,7 +21,7 @@ index 0e8bce923..a51a0d6b5 100644
commandMap.registerServerAliases();
DefaultPermissions.registerCorePermissions();
CraftDefaultPermissions.registerCorePermissions();
@@ -420,12 +423,21 @@ public final class CraftServer implements Server {
@@ -422,12 +425,21 @@ public final class CraftServer implements Server {
pluginManager.disablePlugins();
}

6
CraftBukkit-Patches/0074-Prevent-a-crash-involving-attributes.patch
View file

@ -1,14 +1,14 @@
From 0475c28b0b05edf087275aabe4bf2ffeacf284e2 Mon Sep 17 00:00:00 2001
From f51694a39ea34eac4d3c41ef780ccfd4d96644e4 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sat, 19 Jul 2014 19:54:41 +0100
Subject: [PATCH] Prevent a crash involving attributes
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 6e82a703a..ea8a80df9 100644
index 94d7bd8d7..7a24eca8a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1532,7 +1532,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1553,7 +1553,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
}
AttributeModifiable dummy = new AttributeModifiable(GenericAttributes.MAX_HEALTH, (attribute) -> { });

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

@ -1,4 +1,4 @@
From 46170b9f58a952b535dc96f9092e34c589ed2e36 Mon Sep 17 00:00:00 2001
From 4554236149136f561a94f2bc104e87c09357fa51 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 2faf130b3..d87c418cc 100644
index 981282015..ee24dc7ba 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1434,8 +1434,14 @@ public final class CraftServer implements Server {
@@ -1438,8 +1438,14 @@ public final class CraftServer implements Server {
OfflinePlayer result = getPlayerExact(name);
if (result == null) {

14
CraftBukkit-Patches/0086-BungeeCord-Chat-API.patch
View file

@ -1,4 +1,4 @@
From 9b49a0ed734be82157ecf13e41806b51fd9e7e40 Mon Sep 17 00:00:00 2001
From 689860552f52e8e49615d2502bdbfe315fcbb3ec 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 40e0ea5bc..9ae419f9a 100644
packetdataserializer.a(this.c);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d87c418cc..87fe70ed5 100644
index ee24dc7ba..d05c57ce6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -221,6 +221,8 @@ import org.yaml.snakeyaml.Yaml;
@@ -223,6 +223,8 @@ import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.SafeConstructor;
import org.yaml.snakeyaml.error.MarkedYAMLException;
@ -44,7 +44,7 @@ index d87c418cc..87fe70ed5 100644
public final class CraftServer implements Server {
private final String serverName = "CraftBukkit";
private final String serverVersion;
@@ -2053,6 +2055,20 @@ public final class CraftServer implements Server {
@@ -2057,6 +2059,20 @@ public final class CraftServer implements Server {
public void restart() {
org.spigotmc.RestartCommand.restart();
}
@ -109,10 +109,10 @@ index 039e1ccb9..305de8663 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 cdf1fab87..c5216d626 100644
index 7a24eca8a..82d302832 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -120,6 +120,8 @@ import org.bukkit.plugin.Plugin;
@@ -122,6 +122,8 @@ import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.messaging.StandardMessenger;
import org.bukkit.scoreboard.Scoreboard;
@ -121,7 +121,7 @@ index cdf1fab87..c5216d626 100644
@DelegateDeserialization(CraftOfflinePlayer.class)
public class CraftPlayer extends CraftHumanEntity implements Player {
private long firstPlayed = 0;
@@ -1727,6 +1729,34 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1748,6 +1750,34 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return java.util.Collections.unmodifiableSet( ret );
}