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

Upstream update

Browse Source
This commit is contained in:
Aikar 2017-07-26 21:12:40 -04:00
parent 43543c78c4
commit dcd4f3710f
17 changed files with 124 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From fd7aa7456ea06e3fc65cc8ad065d2d4d4ed690ab Mon Sep 17 00:00:00 2001
From 8f7a6bb066e1009c5e436852a08b4642c93d219d 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
@ -334,7 +334,7 @@ index 000000000..621bf7051
+ }
+}
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 4f8eb0992..7fe2796fe 100644
index 2e72afae2..5e6a7b9e4 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -184,6 +184,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -370,10 +370,10 @@ index f5d387511..fd204ad7a 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 67ee8c55e..ad075615a 100644
index e21fb9bd7..d7af2c00f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -696,6 +696,7 @@ public final class CraftServer implements Server {
@@ -691,6 +691,7 @@ public final class CraftServer implements Server {
}
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
@ -381,7 +381,7 @@ index 67ee8c55e..ad075615a 100644
for (WorldServer world : console.worlds) {
world.worldData.setDifficulty(difficulty);
world.setSpawnFlags(monsters, animals);
@@ -711,6 +712,7 @@ public final class CraftServer implements Server {
@@ -706,6 +707,7 @@ public final class CraftServer implements Server {
world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
}
world.spigotConfig.init(); // Spigot
@ -389,7 +389,7 @@ index 67ee8c55e..ad075615a 100644
}
pluginManager.clearPlugins();
@@ -718,6 +720,7 @@ public final class CraftServer implements Server {
@@ -713,6 +715,7 @@ public final class CraftServer implements Server {
resetRecipes();
reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
@ -397,7 +397,7 @@ index 67ee8c55e..ad075615a 100644
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
int pollCount = 0;
@@ -1771,4 +1774,23 @@ public final class CraftServer implements Server {
@@ -1766,4 +1769,23 @@ public final class CraftServer implements Server {
{
return spigot;
}
@ -482,5 +482,5 @@ index 01e73eb89..0b66f5e35 100644
config.addDefault( "world-settings.default." + path, def );
return config.getString( "world-settings." + worldName + "." + path, config.getString( "world-settings.default." + path ) );
--
2.13.3.windows.1
2.13.0

14
Spigot-Server-Patches/0006-Timings-v2.patch
View File

@ -1,4 +1,4 @@
From a64b953c1a3a0081b9c5ec59a1c00c53b090ff30 Mon Sep 17 00:00:00 2001
From 65851b50f65b8c5b3d50dc61fe0dbc5deb43eb53 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
@ -554,7 +554,7 @@ index a4fca0ca9..161ea8172 100644
// return chunk; // CraftBukkit
}
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 7fe2796fe..2feeb855b 100644
index 5e6a7b9e4..bfc0b0433 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -24,7 +24,7 @@ import java.io.PrintStream;
@ -1399,10 +1399,10 @@ index 8afe1d3d3..00b093976 100644
// CraftBukkit start
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ad075615a..209eaf36d 100644
index d7af2c00f..cfc1cb7de 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1744,6 +1744,7 @@ public final class CraftServer implements Server {
@@ -1739,6 +1739,7 @@ public final class CraftServer implements Server {
private final Spigot spigot = new Spigot()
{
@ -1410,7 +1410,7 @@ index ad075615a..209eaf36d 100644
@Override
public YamlConfiguration getConfig()
{
@@ -1751,6 +1752,24 @@ public final class CraftServer implements Server {
@@ -1746,6 +1747,24 @@ public final class CraftServer implements Server {
}
@Override
@ -1686,7 +1686,7 @@ index ca138fa65..d38900887 100644
public Player.Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index 92d217bce..9952b64be 100644
index 27725b20e..19adb77b5 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -14,6 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger;
@ -1918,5 +1918,5 @@ index 2bd690fdf..38be7ed71 100644
}
}
--
2.13.3.windows.1
2.13.0

8
Spigot-Server-Patches/0020-Further-improve-server-tick-loop.patch
View File

@ -1,4 +1,4 @@
From 09d7a738f298a3c235f4953104deffc6b412537c Mon Sep 17 00:00:00 2001
From 8c888242a7034cab540e1a03ecf5aec57e0d0a20 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
@ -147,10 +147,10 @@ index 024218a1d..9d2f3b834 100644
}
lastTick = curTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e2e57084c..1b27ee67b 100644
index d3639ad55..8f7ccf35a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1741,6 +1741,17 @@ public final class CraftServer implements Server {
@@ -1736,6 +1736,17 @@ public final class CraftServer implements Server {
return CraftMagicNumbers.INSTANCE;
}
@ -210,5 +210,5 @@ index be2e31dea..6d21c3269 100644
return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString()
+ ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 );
--
2.13.2
2.13.0

10
Spigot-Server-Patches/0049-Ensure-commands-are-not-ran-async.patch
View File

@ -1,4 +1,4 @@
From 565286cb530147390d6a34dd63326d1ba28ac4c3 Mon Sep 17 00:00:00 2001
From 295a47e34d028c1f71cb41b34004e596890464fa 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
@ -14,7 +14,7 @@ big slowdown in execution but throwing an exception at same time to raise awaren
that it is happening so that plugin authors can fix their code to stop executing commands async.
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 42b05bee8..125c52614 100644
index f7326aeec..cd88ae7b7 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1299,6 +1299,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -48,10 +48,10 @@ index 42b05bee8..125c52614 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 1b27ee67b..589c67a6c 100644
index 8f7ccf35a..1090ee35e 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 {
@@ -637,6 +637,29 @@ public final class CraftServer implements Server {
Validate.notNull(sender, "Sender cannot be null");
Validate.notNull(commandLine, "CommandLine cannot be null");
@ -82,5 +82,5 @@ index 1b27ee67b..589c67a6c 100644
return true;
}
--
2.13.2
2.13.0

8
Spigot-Server-Patches/0053-Expose-server-CommandMap.patch
View File

@ -1,14 +1,14 @@
From ef145db068f267aab4ff3186a61977f2b236aa9c Mon Sep 17 00:00:00 2001
From 9c9ce99fe37dfa1dce089637e821156ca4d68f37 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 589c67a6c..8af41ea66 100644
index 1090ee35e..5055ab6d3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1552,6 +1552,7 @@ public final class CraftServer implements Server {
@@ -1547,6 +1547,7 @@ public final class CraftServer implements Server {
return helpMap;
}
@ -17,5 +17,5 @@ index 589c67a6c..8af41ea66 100644
return commandMap;
}
--
2.13.2
2.13.0

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

@ -1,4 +1,4 @@
From d0d6eaa5fba325044b1d6e7ef00965570a73580e Mon Sep 17 00:00:00 2001
From 929d344cb479d2127646408e37a798243f8d65c0 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
@ -30,10 +30,10 @@ index 3898ad8fa..2f6e169f5 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 00208ff45..2fc92f308 100644
index 6c6a0854d..815a26284 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -319,6 +319,7 @@ public final class CraftServer implements Server {
@@ -314,6 +314,7 @@ public final class CraftServer implements Server {
if (type == PluginLoadOrder.STARTUP) {
helpMap.clear();
helpMap.initializeGeneralTopics();
@ -41,7 +41,7 @@ index 00208ff45..2fc92f308 100644
}
Plugin[] plugins = pluginManager.getPlugins();
@@ -336,7 +337,7 @@ public final class CraftServer implements Server {
@@ -331,7 +332,7 @@ public final class CraftServer implements Server {
setVanillaCommands(false);
// Spigot end
commandMap.registerServerAliases();
@ -51,5 +51,5 @@ index 00208ff45..2fc92f308 100644
CraftDefaultPermissions.registerCorePermissions();
helpMap.initializeCommands();
--
2.13.0.windows.1
2.13.0

8
Spigot-Server-Patches/0069-Allow-Reloading-of-Custom-Permissions.patch
View File

@ -1,4 +1,4 @@
From b7e59de5e65ebabf3ccf76ef226416d49123fac6 Mon Sep 17 00:00:00 2001
From a1b7df898e8737d3fd84bc0285449f5407fcd847 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 cc8af9491..a695355dd 100644
index 815a26284..7a2c19159 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1848,5 +1848,20 @@ public final class CraftServer implements Server {
@@ -1843,5 +1843,20 @@ public final class CraftServer implements Server {
Bukkit.getLogger().severe("Could not write heap to " + file);
}
}
@ -31,5 +31,5 @@ index cc8af9491..a695355dd 100644
// Paper end
}
--
2.13.3.windows.1
2.13.0

8
Spigot-Server-Patches/0070-Remove-Metadata-on-reload.patch
View File

@ -1,4 +1,4 @@
From b64a5f23a1d7d7c6346ff839899a30cc9cfb72b4 Mon Sep 17 00:00:00 2001
From 0072a8440198f525270b4ab091319daa204087cc 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 b8f90703..d4de72c8 100644
index 7a2c19159..0f7c67256 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -740,8 +740,18 @@ public final class CraftServer implements Server {
@@ -735,8 +735,18 @@ public final class CraftServer implements Server {
world.paperConfig.init(); // Paper
}
@ -30,5 +30,5 @@ index b8f90703..d4de72c8 100644
reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
--
2.13.3.windows.1
2.13.0

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

@ -1,4 +1,4 @@
From aedee6bcb11dca6b91ee4c4093b90e8485e837e7 Mon Sep 17 00:00:00 2001
From 19b25abf11a53f5f7cf115cfdc267a7132fde3fd 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
@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
This lets you disable it for some worlds and lower it for others.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 74a49a5f..3a942c76 100644
index 74a49a5fb..3a942c763 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -284,4 +284,10 @@ public class PaperWorldConfig {
@ -21,7 +21,7 @@ index 74a49a5f..3a942c76 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 6e11ba5b..71b66bbd 100644
index 6e11ba5b6..71b66bbdf 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -356,8 +356,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@ -39,7 +39,7 @@ index 6e11ba5b..71b66bbd 100644
if (i1 - j > 1000L) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 553d9724..e9446b9c 100644
index 553d9724b..e9446b9ce 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -3208,8 +3208,9 @@ public abstract class World implements IBlockAccess {
@ -54,10 +54,10 @@ index 553d9724..e9446b9c 100644
public void a(Packet<?> packet) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d4de72c8..8b77440d 100644
index 0f7c67256..c2a29cde5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -958,7 +958,7 @@ public final class CraftServer implements Server {
@@ -953,7 +953,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()) {
@ -67,7 +67,7 @@ index d4de72c8..8b77440d 100644
for (int j = -short1; j <= short1; j += 16) {
for (int k = -short1; k <= short1; k += 16) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 843a3415..24b4a7ea 100644
index 843a3415f..24b4a7ea7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1275,8 +1275,9 @@ public class CraftWorld implements World {
@ -83,5 +83,5 @@ index 843a3415..24b4a7ea 100644
loadChunk(chunkCoordX + x, chunkCoordZ + z);
} else {
--
2.13.3.windows.1
2.13.0

12
Spigot-Server-Patches/0149-Add-setting-for-proxy-online-mode-status.patch
View File

@ -1,11 +1,11 @@
From d75b758b043fe5cf40c2c26f7b4715297dcf345b Mon Sep 17 00:00:00 2001
From 9b3e6d2518091c83e149e59e0c32243aa820e6cd Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Fri, 5 Aug 2016 01:03:08 +0200
Subject: [PATCH] Add setting for proxy online mode status
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 011cbf5e..cf06f8ac 100644
index 011cbf5e3..cf06f8ac3 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -230,4 +230,9 @@ public class PaperConfig {
@ -19,7 +19,7 @@ index 011cbf5e..cf06f8ac 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
index b943a9b2..8f3b93dc 100644
index b943a9b20..8f3b93dc1 100644
--- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
+++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
@@ -66,7 +66,8 @@ public class NameReferencingFileConverter {
@ -33,10 +33,10 @@ index b943a9b2..8f3b93dc 100644
} else {
String[] astring1 = astring;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8b77440d..7c872ce6 100644
index c2a29cde5..5a9555135 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1323,7 +1323,8 @@ public final class CraftServer implements Server {
@@ -1318,7 +1318,8 @@ public final class CraftServer implements Server {
// Spigot Start
GameProfile profile = null;
// Only fetch an online UUID in online mode
@ -47,5 +47,5 @@ index 8b77440d..7c872ce6 100644
profile = console.getUserCache().getProfile( name );
}
--
2.13.3.windows.1
2.13.0

8
Spigot-Server-Patches/0171-Allow-Reloading-of-Command-Aliases.patch
View File

@ -1,4 +1,4 @@
From 4f7b6ddc23c4aae58b7d62977b5adc3bb87cb828 Mon Sep 17 00:00:00 2001
From da3b13a76dd03704923c2733b178dced3fb12053 Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com>
Date: Mon, 28 Nov 2016 10:21:52 -0500
Subject: [PATCH] Allow Reloading of Command Aliases
@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
Reload the aliases stored in commands.yml
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index bc1847c0c..1a5730a21 100644
index 5a9555135..6dba269e7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1874,5 +1874,24 @@ public final class CraftServer implements Server {
@@ -1869,5 +1869,24 @@ public final class CraftServer implements Server {
});
}
}
@ -35,5 +35,5 @@ index bc1847c0c..1a5730a21 100644
// Paper end
}
--
2.13.3.windows.1
2.13.0

8
Spigot-Server-Patches/0210-Add-configuration-option-to-prevent-player-names-fro.patch
View File

@ -1,4 +1,4 @@
From 276daad3cb0c9174758e498c8035591708d71c5e Mon Sep 17 00:00:00 2001
From e4c4805b5122877b5bed6cfe116e0d5ee7bf3991 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Fri, 9 Jun 2017 07:24:34 -0700
Subject: [PATCH] Add configuration option to prevent player names from being
@ -20,10 +20,10 @@ index 28917f63d..f4b237034 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1a5730a21..49a321d5d 100644
index 6dba269e7..3e5421932 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1893,5 +1893,10 @@ public final class CraftServer implements Server {
@@ -1888,5 +1888,10 @@ public final class CraftServer implements Server {
commandMap.registerServerAliases();
return true;
}
@ -35,5 +35,5 @@ index 1a5730a21..49a321d5d 100644
// Paper end
}
--
2.13.3.windows.1
2.13.0

8
Spigot-Server-Patches/0211-Use-TerminalConsoleAppender-for-console-improvements.patch
View File

@ -1,4 +1,4 @@
From 811b012817d88586fba83c6798297827910ff7fd Mon Sep 17 00:00:00 2001
From 3125ca55ee5597dadaf02f5b4e700ececde69805 Mon Sep 17 00:00:00 2001
From: Minecrell <dev@minecrell.net>
Date: Fri, 9 Jun 2017 19:03:43 +0200
Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@ -184,7 +184,7 @@ index 000000000..d5bc61490
+
+}
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 2feeb855b..3266df1f5 100644
index bfc0b0433..d1507c139 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -73,7 +73,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -310,7 +310,7 @@ index 17c251ba9..c47e05c19 100644
this.k = new GameProfileBanList(PlayerList.a);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 49a321d5d..aa9b3f1c9 100644
index 3e5421932..1bc712fa1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -127,7 +127,6 @@ import io.netty.buffer.ByteBuf;
@ -321,7 +321,7 @@ index 49a321d5d..aa9b3f1c9 100644
import org.apache.commons.lang.StringUtils;
import org.bukkit.NamespacedKey;
import org.bukkit.craftbukkit.util.CraftNamespacedKey;
@@ -1091,9 +1090,13 @@ public final class CraftServer implements Server {
@@ -1086,9 +1085,13 @@ public final class CraftServer implements Server {
return logger;
}

8
Spigot-Server-Patches/0217-Add-UnknownCommandEvent.patch
View File

@ -1,11 +1,11 @@
From 5b83d8d65fe182f3e28b833fade0fb9213668110 Mon Sep 17 00:00:00 2001
From 02d530402fe0265e0a21fc07916497ed13beb315 Mon Sep 17 00:00:00 2001
From: Sweepyoface <github@sweepy.pw>
Date: Sat, 17 Jun 2017 18:48:21 -0400
Subject: [PATCH] Add UnknownCommandEvent
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index a4b6f4be1..6ff57c0e0 100644
index 1bc712fa1..bc741281b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -78,6 +78,7 @@ import org.bukkit.craftbukkit.util.Versioning;
@ -16,7 +16,7 @@ index a4b6f4be1..6ff57c0e0 100644
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.event.player.PlayerChatTabCompleteEvent;
import org.bukkit.event.world.WorldInitEvent;
@@ -672,7 +673,13 @@ public final class CraftServer implements Server {
@@ -667,7 +668,13 @@ public final class CraftServer implements Server {
// Spigot start
if (StringUtils.isNotEmpty(org.spigotmc.SpigotConfig.unknownCommandMessage)) {
@ -32,5 +32,5 @@ index a4b6f4be1..6ff57c0e0 100644
// Spigot end
--
2.13.2
2.13.0

51
Spigot-Server-Patches/0223-Fix-Recipe-Books.patch Normal file
View File

@ -0,0 +1,51 @@
From 0cf8f4b90cf6e449f339a187198355e1cffbbe2a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 26 Jul 2017 21:12:15 -0400
Subject: [PATCH] Fix Recipe Books
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 682211cdd..0b0a34508 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2027,12 +2027,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
public void a(PacketPlayInAutoRecipe packetplayinautorecipe) {
PlayerConnectionUtils.ensureMainThread(packetplayinautorecipe, this, this.player.x());
this.player.resetIdleTimer();
- // CraftBukkit start
- if (!player.getBukkitEntity().hasPermission("minecraft.autocraft")) {
- player.getBukkitEntity().updateInventory();
- return;
- }
- // CraftBukkit end
if (this.player.activeContainer.windowId == packetplayinautorecipe.a() && this.player.activeContainer.c(this.player)) {
this.player.playerConnection.sendPacket(new PacketPlayOutTransaction(packetplayinautorecipe.a(), packetplayinautorecipe.b(), true));
Iterator iterator;
@@ -2046,7 +2040,10 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
while (iterator.hasNext()) {
packetplayinautorecipe_a = (PacketPlayInAutoRecipe.a) iterator.next();
itemstack = this.player.activeContainer.getSlot(packetplayinautorecipe_a.b).getItem();
- if (this.a(packetplayinautorecipe_a.a, itemstack)) {
+ // Paper start - improve validation
+ ItemStack to = this.player.activeContainer.getSlot(packetplayinautorecipe_a.c).getItem();
+ if (this.a(packetplayinautorecipe_a.a, itemstack) && (to.isEmpty() || this.a(packetplayinautorecipe_a.a, to))) {
+ // Paper end
i = packetplayinautorecipe_a.a.getCount();
if (packetplayinautorecipe_a.c == -1) {
this.player.drop(packetplayinautorecipe_a.a, true);
@@ -2066,6 +2063,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
itemstack.subtract(i);
}
}
+ // Paper start
+ else {
+ this.player.getBukkitEntity().updateInventory();
+ return;
+ }
+ // Paper end
}
}
--
2.13.0

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 4670a84bd9db26b4fd013f723f2089ae570ec9ae
Subproject commit b1b9ab0df94c3b4b5c2613b7bf6347be10e864fc

2
work/Spigot

@ -1 +1 @@
Subproject commit 99c2a370408a7e4359eb40763b9c4efe8ef68932
Subproject commit 596221bf2ffd4e694d008406f7940a8a041a71fb