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

Upstream merge

Browse Source
This commit is contained in:
Thinkofdeath 2014-05-14 14:02:09 +01:00
parent fbdc043a85
commit e21770a060
11 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bukkit

@ -1 +1 @@
Subproject commit aa8336ec6a2981eb577fb07fc8102b8ab4d9987e
Subproject commit 24883a61704f78a952e948c429f63c4a2ab39912

2
CraftBukkit

@ -1 +1 @@
Subproject commit 8f0832a4bb4ce623f9303a11a5dbe4207b1610b1
Subproject commit e1cec477acaa2c6e140a5d3d37c1797f55569e23

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

@ -1,4 +1,4 @@
From d36fbfecfe40509da20f581af79322589ead5414 Mon Sep 17 00:00:00 2001
From 0583597f21e65ab38ab36899f99299a6463a1735 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 2 Jul 2013 13:07:39 +1000
Subject: [PATCH] POM Changes
@ -142,10 +142,10 @@ index 84a00a3..607be4e 100644
<execution>
<phase>package</phase>
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 111abb8..59010eb 100644
index 3be5174..853e5d2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -310,7 +310,7 @@ public final class CraftServer implements Server {
@@ -308,7 +308,7 @@ public final class CraftServer implements Server {
loadIcon();
updater = new AutoUpdater(new BukkitDLUpdaterService(configuration.getString("auto-updater.host")), getLogger(), configuration.getString("auto-updater.preferred-channel"));
@ -168,5 +168,5 @@ index f905d17..9304637 100644
if (stream != null) {
--
1.8.5.2.msysgit.0
1.9.1

10
CraftBukkit-Patches/0005-Spigot-Configuration.patch
View File

@ -1,4 +1,4 @@
From 65856207ce4a6941e16aee9636f85f6209b07f85 Mon Sep 17 00:00:00 2001
From 113ad2d77cebbed4a6dbbcb7cec0e476f494b17b 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
@ -54,10 +54,10 @@ index bbf61a3..fab5025 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 59010eb..bb1bddf 100644
index 853e5d2..95742fa 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -316,8 +316,10 @@ public final class CraftServer implements Server {
@@ -314,8 +314,10 @@ public final class CraftServer implements Server {
updater.getOnUpdate().addAll(configuration.getStringList("auto-updater.on-update"));
updater.check(serverVersion);
@ -70,7 +70,7 @@ index 59010eb..bb1bddf 100644
}
public boolean getCommandBlockOverride(String command) {
@@ -751,6 +753,7 @@ public final class CraftServer implements Server {
@@ -749,6 +751,7 @@ public final class CraftServer implements Server {
logger.log(Level.WARNING, "Failed to load banned-players.json, " + ex.getMessage());
}
@ -78,7 +78,7 @@ index 59010eb..bb1bddf 100644
for (WorldServer world : console.worlds) {
world.difficulty = difficulty;
world.setSpawnFlags(monsters, animals);
@@ -765,11 +768,14 @@ public final class CraftServer implements Server {
@@ -763,11 +766,14 @@ public final class CraftServer implements Server {
} else {
world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
}

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

@ -1,4 +1,4 @@
From cce115d0487bfddbe96b7a5341ece92fc4465ab8 Mon Sep 17 00:00:00 2001
From cabbfafe4301f951c0eb3d810af5350f45fc4cff Mon Sep 17 00:00:00 2001
From: Antony Riley <antony@cyberiantiger.org>
Date: Wed, 27 Mar 2013 01:41:54 +0200
Subject: [PATCH] Close Unloaded Save Files
@ -18,10 +18,10 @@ index 900ed68..829f4a3 100644
public static synchronized RegionFile a(File file1, int i, int j) {
File file2 = new File(file1, "region");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index bb1bddf..f66f764 100644
index 95742fa..24d4e76 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -86,6 +86,8 @@ import net.minecraft.server.MinecraftServer;
@@ -85,6 +85,8 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.server.MobEffectList;
import net.minecraft.server.PropertyManager;
import net.minecraft.server.ServerCommand;
@ -30,7 +30,7 @@ index bb1bddf..f66f764 100644
import net.minecraft.server.ServerNBTManager;
import net.minecraft.server.WorldLoaderServer;
import net.minecraft.server.WorldManager;
@@ -1021,6 +1023,30 @@ public final class CraftServer implements Server {
@@ -1019,6 +1021,30 @@ public final class CraftServer implements Server {
worlds.remove(world.getName().toLowerCase());
console.worlds.remove(console.worlds.indexOf(handle));

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

@ -1,14 +1,14 @@
From 6032a32dff698ab5eee24a87c19aa6a0dc0f7dda Mon Sep 17 00:00:00 2001
From 8757372e0d0333692126e407de47cdba81e824b4 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:05:54 +1000
Subject: [PATCH] Allow Disabling of Command TabComplete
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index df0a5ac..2bd80ab 100644
index 24d4e76..7b68460 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1602,6 +1602,13 @@ public final class CraftServer implements Server {
@@ -1600,6 +1600,13 @@ public final class CraftServer implements Server {
}
public List<String> tabCompleteCommand(Player player, String message) {

6
CraftBukkit-Patches/0035-Configurable-Messages.patch
View File

@ -1,4 +1,4 @@
From c036ffdf17e499b702947010eaeaeaa0e1b8f2f9 Mon Sep 17 00:00:00 2001
From e35855cf232e8ca71cad50484959b98e247ae142 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 2a15271..e156a5a 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 53be9ae..e209ef4 100644
index 7b68460..73d92fd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -708,11 +708,7 @@ public final class CraftServer implements Server {
@@ -706,11 +706,7 @@ public final class CraftServer implements Server {
return true;
}

6
CraftBukkit-Patches/0066-BungeeCord-Support.patch
View File

@ -1,4 +1,4 @@
From 0e24dd43654d91417b154781cf244225845ae584 Mon Sep 17 00:00:00 2001
From edbcf8d6f20fe171f6ec76291e33c7192110b59b 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
@ -156,10 +156,10 @@ index 4c5d77e..cd9a8f5 100644
if (this.j.isBanned(gameprofile) && !this.j.get(gameprofile).e()) { // Should be hasExpired
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6a556cf..92ae2fa 100644
index 73d92fd..4c13657 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -648,7 +648,13 @@ public final class CraftServer implements Server {
@@ -646,7 +646,13 @@ public final class CraftServer implements Server {
}
public long getConnectionThrottle() {

10
CraftBukkit-Patches/0102-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
View File

@ -1,14 +1,14 @@
From 9fc4666047c68200edc492548a235285fb4f7b96 Mon Sep 17 00:00:00 2001
From 1773a7d0466bd589b631eb382ba152ef7f59fc58 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 e209ef4..80a1eeb 100644
index 4c13657..66094ed 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -121,6 +121,7 @@ import org.bukkit.command.CommandSender;
@@ -120,6 +120,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.command.PluginCommand;
import org.bukkit.command.SimpleCommandMap;
@ -16,7 +16,7 @@ index e209ef4..80a1eeb 100644
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.configuration.serialization.ConfigurationSerialization;
@@ -388,8 +389,11 @@ public final class CraftServer implements Server {
@@ -386,8 +387,11 @@ public final class CraftServer implements Server {
}
if (type == PluginLoadOrder.POSTWORLD) {
@ -29,7 +29,7 @@ index e209ef4..80a1eeb 100644
commandMap.registerServerAliases();
loadCustomPermissions();
DefaultPermissions.registerCorePermissions();
@@ -401,51 +405,64 @@ public final class CraftServer implements Server {
@@ -399,51 +403,64 @@ public final class CraftServer implements Server {
pluginManager.disablePlugins();
}

6
CraftBukkit-Patches/0128-Check-for-blank-OfflinePlayer-Names.patch
View File

@ -1,14 +1,14 @@
From 51656df39d68c5d237d1af708dc29d6aded18902 Mon Sep 17 00:00:00 2001
From 3bc7abac8731fbaf92b84aac3e38a50aceaf8647 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 e673546..3183fc8 100644
index 66094ed..56ed950 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1325,6 +1325,7 @@ public final class CraftServer implements Server {
@@ -1323,6 +1323,7 @@ public final class CraftServer implements Server {
public OfflinePlayer getOfflinePlayer(String name) {
Validate.notNull(name, "Name cannot be null");

8
CraftBukkit-Patches/0136-Don-t-special-case-invalid-usernames-for-UUIDs.patch
View File

@ -1,14 +1,14 @@
From 2727691fd928aaac0e1fffac8a356e1246d890a0 Mon Sep 17 00:00:00 2001
From 3d84c65fcb556615aacd378348240fffb8611f33 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 20 Apr 2014 18:58:00 +1000
Subject: [PATCH] Don't special case 'invalid' usernames for UUIDs.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3183fc8..06b1ee7 100644
index 56ed950..c5268f1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -231,8 +231,6 @@ public final class CraftServer implements Server {
@@ -229,8 +229,6 @@ public final class CraftServer implements Server {
private boolean printSaveWarning;
private CraftIconCache icon;
private boolean overrideAllCommandBlockCommands = false;
@ -17,7 +17,7 @@ index 3183fc8..06b1ee7 100644
private final class BooleanWrapper {
private boolean value = true;
@@ -1327,11 +1325,6 @@ public final class CraftServer implements Server {
@@ -1325,11 +1323,6 @@ public final class CraftServer implements Server {
Validate.notNull(name, "Name cannot be null");
com.google.common.base.Preconditions.checkArgument( !org.apache.commons.lang.StringUtils.isBlank( name ), "Name cannot be blank" ); // Spigot