Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-17 16:15:24 +01:00
Code Issues Projects Releases Wiki Activity

Upstream merge Bukkit, update Paperclip

Browse Source
This commit is contained in:
Zach Brown 2016-03-21 09:03:17 -05:00
parent e2bbf2228d
commit 836ec9dc1a
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bukkit

@ -1 +1 @@
Subproject commit b3f619f3c5ceb503c3649fe16a36b3fc90326a44 Subproject commit 3c2337eebff5dd9ae2497b751586def2571c9470

2
Paperclip

@ -1 +1 @@
Subproject commit d7d0fdd04744d138ce2b789b29ecb1ef1adf408d Subproject commit 1d8ff24ec3fff88334498bfb4071b6b6c834cc07

10
Spigot-Server-Patches/0099-Support-offline-mode-in-whitelist-command-as-well.patch
View File

@ -1,14 +1,14 @@
From 49f713b4c216db30a4122429beb6143aa93547e2 Mon Sep 17 00:00:00 2001 From e246c430c32e0e7886e2509ab2796506fc94aaa2 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 21 Mar 2016 00:19:18 -0500 Date: Mon, 21 Mar 2016 00:19:18 -0500
Subject: [PATCH] Support offline mode in whitelist command as well Subject: [PATCH] Support offline mode in whitelist command as well
diff --git a/src/main/java/net/minecraft/server/CommandWhitelist.java b/src/main/java/net/minecraft/server/CommandWhitelist.java diff --git a/src/main/java/net/minecraft/server/CommandWhitelist.java b/src/main/java/net/minecraft/server/CommandWhitelist.java
index b52bf74..65a93ef 100644 index b52bf74..2d08a36 100644
--- a/src/main/java/net/minecraft/server/CommandWhitelist.java --- a/src/main/java/net/minecraft/server/CommandWhitelist.java
+++ b/src/main/java/net/minecraft/server/CommandWhitelist.java +++ b/src/main/java/net/minecraft/server/CommandWhitelist.java
@@ -43,24 +45,35 @@ public class CommandWhitelist extends CommandAbstract { @@ -43,24 +43,35 @@ public class CommandWhitelist extends CommandAbstract {
throw new ExceptionUsage("commands.whitelist.add.usage", new Object[0]); throw new ExceptionUsage("commands.whitelist.add.usage", new Object[0]);
} }
@ -44,7 +44,7 @@ index b52bf74..65a93ef 100644
a(icommandlistener, (ICommand) this, "commands.whitelist.remove.success", new Object[] { astring[1]}); a(icommandlistener, (ICommand) this, "commands.whitelist.remove.success", new Object[] { astring[1]});
} else if (astring[0].equals("reload")) { } else if (astring[0].equals("reload")) {
minecraftserver.getPlayerList().reloadWhitelist(); minecraftserver.getPlayerList().reloadWhitelist();
@@ -88,4 +101,48 @@ public class CommandWhitelist extends CommandAbstract { @@ -88,4 +99,48 @@ public class CommandWhitelist extends CommandAbstract {
return Collections.emptyList(); return Collections.emptyList();
} }
} }
@ -94,5 +94,5 @@ index b52bf74..65a93ef 100644
+ // Paper end + // Paper end
} }
-- --
2.7.4.windows.1 2.7.3