Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 02:25:28 +01:00
Code Issues Projects Releases Wiki Activity

Update B/CB/S

Browse Source 
Closes GH-288
This commit is contained in:
Zach Brown 2016-05-20 17:32:50 -05:00
parent d22f9071ff
commit df1df5d4b4
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
16 changed files with 57 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0002-Paper-config-files.patch
View File

@ -1,4 +1,4 @@
From e7da3c333a344c248d825b4b2df0d0ff6c8ac238 Mon Sep 17 00:00:00 2001
From f9f9612876507164ff9977d6ac22d948ced258c1 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 21:02:09 -0600
Subject: [PATCH] Paper config files
@ -289,10 +289,10 @@ index a7ab03d..4dd6777 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 d9992f1..7fae554 100644
index 5994c1b..12156d4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -692,6 +692,7 @@ public final class CraftServer implements Server {
@@ -693,6 +693,7 @@ public final class CraftServer implements Server {
}
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
@ -300,7 +300,7 @@ index d9992f1..7fae554 100644
for (WorldServer world : console.worlds) {
world.worldData.setDifficulty(difficulty);
world.setSpawnFlags(monsters, animals);
@@ -707,12 +708,14 @@ public final class CraftServer implements Server {
@@ -708,12 +709,14 @@ public final class CraftServer implements Server {
world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
}
world.spigotConfig.init(); // Spigot

10
Spigot-Server-Patches/0005-Timings-v2.patch
View File

@ -1,4 +1,4 @@
From 5e8f9b65bb21ee111ac18d14817827fbfa6ad44e Mon Sep 17 00:00:00 2001
From 1e9a4f7eedf6ac49348969aa5e1337b0077065de Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 04:00:11 -0600
Subject: [PATCH] Timings v2
@ -215,7 +215,7 @@ index 0000000..11dd692
+ }
+}
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 4f4377e..252c6c3 100644
index 0468372..7739e78 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit;
@ -851,10 +851,10 @@ index f8ef497..4980c7a 100644
this.methodProfiler.b();
this.U.clear();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7fae554..3f27fe6 100644
index 12156d4..f0db144 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1719,6 +1719,7 @@ public final class CraftServer implements Server {
@@ -1726,6 +1726,7 @@ public final class CraftServer implements Server {
private final Spigot spigot = new Spigot()
{
@ -862,7 +862,7 @@ index 7fae554..3f27fe6 100644
@Override
public YamlConfiguration getConfig()
{
@@ -1726,6 +1727,24 @@ public final class CraftServer implements Server {
@@ -1733,6 +1734,24 @@ public final class CraftServer implements Server {
}
@Override

6
Spigot-Server-Patches/0018-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
View File

@ -1,4 +1,4 @@
From 16b868449a03eefbd94542578d058176425e41ae Mon Sep 17 00:00:00 2001
From b8648e1d9e01eeac13172af13bf3fdce578d0463 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 14:32:43 -0600
Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
@ -33,10 +33,10 @@ index 8845ad2..14389dd 100644
public CrashReport b(CrashReport crashreport) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3f27fe6..52155e8 100644
index f0db144..abb1653 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -130,7 +130,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
@@ -131,7 +131,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
public final class CraftServer implements Server {
private static final Player[] EMPTY_PLAYER_ARRAY = new Player[0];

6
Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch
View File

@ -1,4 +1,4 @@
From 4c865cb3096bf8d40245c09142b7bee6e4f5d5e0 Mon Sep 17 00:00:00 2001
From 5ba80486ec3af8f212ebcfdc8dbdb985d4f1761d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 1 Mar 2016 23:09:29 -0600
Subject: [PATCH] Further improve server tick loop
@ -148,10 +148,10 @@ index 14389dd..ebf6c48 100644
}
lastTick = curTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 52155e8..14e5647 100644
index abb1653..cae55fb 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1716,6 +1716,17 @@ public final class CraftServer implements Server {
@@ -1723,6 +1723,17 @@ public final class CraftServer implements Server {
return CraftMagicNumbers.INSTANCE;
}

6
Spigot-Server-Patches/0056-Ensure-commands-are-not-ran-async.patch
View File

@ -1,4 +1,4 @@
From 49a93c12b64029ade8efbe041717bfd6505976db Mon Sep 17 00:00:00 2001
From a36d163a35b3216d034a1344206872f6ab921be4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 01:17:12 -0600
Subject: [PATCH] Ensure commands are not ran async
@ -48,10 +48,10 @@ index 0c2c151..2cde490 100644
} else if (this.player.getChatFlags() == EntityHuman.EnumChatVisibility.SYSTEM) {
// Do nothing, this is coming from a plugin
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 14e5647..c6cee80 100644
index cae55fb..2b49d69 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -642,6 +642,29 @@ public final class CraftServer implements Server {
@@ -643,6 +643,29 @@ public final class CraftServer implements Server {
Validate.notNull(sender, "Sender cannot be null");
Validate.notNull(commandLine, "CommandLine cannot be null");

21
Spigot-Server-Patches/0058-Add-Location-support-to-tab-completers-vanilla-featu.patch
View File

@ -1,4 +1,4 @@
From 9a35dcacf6c7419e788d81e7704b177ab3c3c5ff Mon Sep 17 00:00:00 2001
From 47467b9ed89eb4761a409425af0d77d513e98c60 Mon Sep 17 00:00:00 2001
From: DemonWav <demonwav@gmail.com>
Date: Thu, 3 Mar 2016 01:44:39 -0600
Subject: [PATCH] Add Location support to tab completers (vanilla feature
@ -33,7 +33,7 @@ index bbdb19a..3d2e0b6 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c6cee80..3a288bd 100644
index 2b49d69..bc48cf6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -25,17 +25,11 @@ import javax.imageio.ImageIO;
@ -56,7 +56,7 @@ index c6cee80..3a288bd 100644
import org.bukkit.boss.BarColor;
import org.bukkit.boss.BarFlag;
import org.bukkit.boss.BarStyle;
@@ -1606,21 +1600,38 @@ public final class CraftServer implements Server {
@@ -1607,6 +1601,14 @@ public final class CraftServer implements Server {
}
public List<String> tabComplete(net.minecraft.server.ICommandListener sender, String message) {
@ -71,14 +71,19 @@ index c6cee80..3a288bd 100644
if (!(sender instanceof EntityPlayer)) {
return ImmutableList.of();
}
@@ -1614,7 +1616,7 @@ public final class CraftServer implements Server {
List<String> offers;
Player player = ((EntityPlayer) sender).getBukkitEntity();
if (message.startsWith("/")) {
- return tabCompleteCommand(player, message);
+ return tabCompleteCommand(player, message, blockPosition);
- offers = tabCompleteCommand(player, message);
+ offers = tabCompleteCommand(player, message, blockPosition);
} else {
return tabCompleteChat(player, message);
offers = tabCompleteChat(player, message);
}
@@ -1623,11 +1625,20 @@ public final class CraftServer implements Server {
getPluginManager().callEvent(tabEvent);
return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions();
+ // Paper end
}
@ -97,7 +102,7 @@ index c6cee80..3a288bd 100644
{
return ImmutableList.of();
}
@@ -1628,7 +1639,14 @@ public final class CraftServer implements Server {
@@ -1635,7 +1646,14 @@ public final class CraftServer implements Server {
List<String> completions = null;
try {

6
Spigot-Server-Patches/0062-Expose-server-CommandMap.patch
View File

@ -1,14 +1,14 @@
From ae2a2c8c665502da7624f701485c21920fdfec0f Mon Sep 17 00:00:00 2001
From ef4ff54759bcfc8a1002c2bec92d661542798468 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Thu, 3 Mar 2016 02:15:57 -0600
Subject: [PATCH] Expose server CommandMap
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3a288bd..794a2c9 100644
index bc48cf6..47851c1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1560,6 +1560,7 @@ public final class CraftServer implements Server {
@@ -1561,6 +1561,7 @@ public final class CraftServer implements Server {
return helpMap;
}

6
Spigot-Server-Patches/0064-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
View File

@ -1,14 +1,14 @@
From 7711f8c30afc2a1a0cc61786f5fe5ca087e3b1ad Mon Sep 17 00:00:00 2001
From 4f03ec9512277188129246d8315d1cbc42f3ad9b Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 3 Mar 2016 02:21:58 -0600
Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 794a2c9..b6be0d7 100644
index 47851c1..08edd53 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1313,6 +1313,18 @@ public final class CraftServer implements Server {
@@ -1314,6 +1314,18 @@ public final class CraftServer implements Server {
return count;
}

10
Spigot-Server-Patches/0079-Default-loading-permissions.yml-before-plugins.patch
View File

@ -1,4 +1,4 @@
From c2eb5b571398d8cabe2e4fb957d5f2f1960ebe95 Mon Sep 17 00:00:00 2001
From 6da295d495dc7a8262baaa2dfc7fe3c291b96bfe Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 13:17:38 -0400
Subject: [PATCH] Default loading permissions.yml before plugins
@ -16,7 +16,7 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
A config option has been added for those who depend on the previous behavior, but I don't expect that.
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 34e0426..770866f 100644
index 4c28483..25eb832 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -203,4 +203,9 @@ public class PaperConfig {
@ -30,10 +30,10 @@ index 34e0426..770866f 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b6be0d7..5b91630 100644
index 08edd53..c6c6cfe 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -306,6 +306,7 @@ public final class CraftServer implements Server {
@@ -307,6 +307,7 @@ public final class CraftServer implements Server {
if (type == PluginLoadOrder.STARTUP) {
helpMap.clear();
helpMap.initializeGeneralTopics();
@ -41,7 +41,7 @@ index b6be0d7..5b91630 100644
}
Plugin[] plugins = pluginManager.getPlugins();
@@ -323,7 +324,7 @@ public final class CraftServer implements Server {
@@ -324,7 +325,7 @@ public final class CraftServer implements Server {
setVanillaCommands(false);
// Spigot end
commandMap.registerServerAliases();

6
Spigot-Server-Patches/0080-Allow-Reloading-of-Custom-Permissions.patch
View File

@ -1,4 +1,4 @@
From 56e2e0cd842f4fa51efdc32e33d90a384c49ef52 Mon Sep 17 00:00:00 2001
From 4af257901d3e5e068cb582aa0cb016f17f118f18 Mon Sep 17 00:00:00 2001
From: William <admin@domnian.com>
Date: Fri, 18 Mar 2016 03:30:17 -0400
Subject: [PATCH] Allow Reloading of Custom Permissions
@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
https://github.com/PaperMC/Paper/issues/49
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 5b91630..20a8ef7 100644
index c6c6cfe..1d304eb 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1834,4 +1834,21 @@ public final class CraftServer implements Server {
@@ -1841,4 +1841,21 @@ public final class CraftServer implements Server {
{
return spigot;
}

6
Spigot-Server-Patches/0081-Remove-Metadata-on-reload.patch
View File

@ -1,4 +1,4 @@
From 78032f81e6af76e2a40e2acbbc1de025b4a0bd90 Mon Sep 17 00:00:00 2001
From 9c4b544c1ba8f66e8267295fead58da7f7f684c7 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 13:50:14 -0400
Subject: [PATCH] Remove Metadata on reload
@ -7,10 +7,10 @@ Metadata is not meant to persist reload as things break badly with non primitive
This will remove metadata on reload so it does not crash everything if a plugin uses it.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 20a8ef7..e957ed0 100644
index 1d304eb..e6cce51 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -729,6 +729,14 @@ public final class CraftServer implements Server {
@@ -730,6 +730,14 @@ public final class CraftServer implements Server {
world.paperConfig.init(); // Paper
}

6
Spigot-Server-Patches/0114-Add-getEntity-by-UUID-API.patch
View File

@ -1,4 +1,4 @@
From 60d48a782502bf6c276124acfd412f18390a4ac7 Mon Sep 17 00:00:00 2001
From 85092d7597bb75335744094cdc93a0fd367e4a4c Mon Sep 17 00:00:00 2001
From: DemonWav <demonwav@gmail.com>
Date: Wed, 30 Mar 2016 01:20:11 -0500
Subject: [PATCH] Add getEntity by UUID API
@ -30,7 +30,7 @@ index 3d2e0b6..842e364 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e957ed0..0a5301f 100644
index e6cce51..a0478f2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -46,6 +46,7 @@ import org.bukkit.configuration.serialization.ConfigurationSerialization;
@ -41,7 +41,7 @@ index e957ed0..0a5301f 100644
import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.craftbukkit.generator.CraftChunkData;
import org.bukkit.craftbukkit.help.SimpleHelpMap;
@@ -1858,5 +1859,14 @@ public final class CraftServer implements Server {
@@ -1865,5 +1866,14 @@ public final class CraftServer implements Server {
});
}
}

6
Spigot-Server-Patches/0120-Configurable-Keep-Spawn-Loaded-range-per-world.patch
View File

@ -1,4 +1,4 @@
From 01d78e7d212614b991a1e4b2ae57b8b85c439610 Mon Sep 17 00:00:00 2001
From 61779a525b1be7b2561a7445fc1bd1f471a340a5 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 13 Sep 2014 23:14:43 -0400
Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@ -50,10 +50,10 @@ index 5223785..7bfb735 100644
return k >= -short0 && k <= short0 && l >= -short0 && l <= short0 && this.keepSpawnInMemory; // CraftBukkit - Added 'this.keepSpawnInMemory'
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0a5301f..e6a76cf 100644
index a0478f2..975a036 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -945,7 +945,7 @@ public final class CraftServer implements Server {
@@ -946,7 +946,7 @@ public final class CraftServer implements Server {
System.out.print("Preparing start region for level " + (console.worlds.size() - 1) + " (Seed: " + internal.getSeed() + ")");
if (internal.getWorld().getKeepSpawnInMemory()) {

2
work/Bukkit

@ -1 +1 @@
Subproject commit 329ef57aea4529ce36b9d59b22d2ce00d1c64cb0
Subproject commit b276e93f56cc04aaa2011efa1fe16b839c611eb7

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 4e19de129580f7e2e9bf10734e09d3dbc3ca9722
Subproject commit d8637dfb7e581c9745aa8f7f505b971c99720159

2
work/Spigot

@ -1 +1 @@
Subproject commit 4af49dc0abc0056b1f66f92a2ee107f9f1749a82
Subproject commit 8a048fe4a4351b6a293cea7409a42332a31f17f5