Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 3108e64a SPIGOT-4193: API for selecting entities by strings CraftBukkit Changes: ad6070df SPIGOT-4193: API for selecting entities by strings
This commit is contained in:
parent
e87859d8a5
commit
7a73ce03e9
33 changed files with 247 additions and 247 deletions
|
@ -1,4 +1,4 @@
|
|||
From ff98fafe0ee4c98543641b45bb0e6c0a261c69d2 Mon Sep 17 00:00:00 2001
|
||||
From 92f2c6e98e370ef4bc1f110e8eb7a85dc11eaac9 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 29 Feb 2016 18:48:17 -0600
|
||||
Subject: [PATCH] Timings v2
|
||||
|
@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
|
|||
|
||||
diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java
|
||||
new file mode 100644
|
||||
index 00000000..98079dc0
|
||||
index 000000000..98079dc0c
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/FullServerTickHandler.java
|
||||
@@ -0,0 +1,82 @@
|
||||
|
@ -94,7 +94,7 @@ index 00000000..98079dc0
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/NullTimingHandler.java b/src/main/java/co/aikar/timings/NullTimingHandler.java
|
||||
new file mode 100644
|
||||
index 00000000..8c43e206
|
||||
index 000000000..8c43e2061
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/NullTimingHandler.java
|
||||
@@ -0,0 +1,61 @@
|
||||
|
@ -161,7 +161,7 @@ index 00000000..8c43e206
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/TimedEventExecutor.java b/src/main/java/co/aikar/timings/TimedEventExecutor.java
|
||||
new file mode 100644
|
||||
index 00000000..feddcdbd
|
||||
index 000000000..feddcdbd4
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java
|
||||
@@ -0,0 +1,81 @@
|
||||
|
@ -248,7 +248,7 @@ index 00000000..feddcdbd
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/Timing.java b/src/main/java/co/aikar/timings/Timing.java
|
||||
new file mode 100644
|
||||
index 00000000..b2260104
|
||||
index 000000000..b2260104c
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/Timing.java
|
||||
@@ -0,0 +1,76 @@
|
||||
|
@ -330,7 +330,7 @@ index 00000000..b2260104
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/TimingData.java b/src/main/java/co/aikar/timings/TimingData.java
|
||||
new file mode 100644
|
||||
index 00000000..f222d6b7
|
||||
index 000000000..f222d6b7d
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/TimingData.java
|
||||
@@ -0,0 +1,120 @@
|
||||
|
@ -456,7 +456,7 @@ index 00000000..f222d6b7
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/TimingHandler.java b/src/main/java/co/aikar/timings/TimingHandler.java
|
||||
new file mode 100644
|
||||
index 00000000..521c985e
|
||||
index 000000000..521c985e6
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/TimingHandler.java
|
||||
@@ -0,0 +1,200 @@
|
||||
|
@ -662,7 +662,7 @@ index 00000000..521c985e
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java
|
||||
new file mode 100644
|
||||
index 00000000..28d0954a
|
||||
index 000000000..28d0954a3
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/TimingHistory.java
|
||||
@@ -0,0 +1,345 @@
|
||||
|
@ -1013,7 +1013,7 @@ index 00000000..28d0954a
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/TimingHistoryEntry.java b/src/main/java/co/aikar/timings/TimingHistoryEntry.java
|
||||
new file mode 100644
|
||||
index 00000000..0e114eb3
|
||||
index 000000000..0e114eb32
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/TimingHistoryEntry.java
|
||||
@@ -0,0 +1,55 @@
|
||||
|
@ -1074,7 +1074,7 @@ index 00000000..0e114eb3
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/TimingIdentifier.java b/src/main/java/co/aikar/timings/TimingIdentifier.java
|
||||
new file mode 100644
|
||||
index 00000000..a7f1f44d
|
||||
index 000000000..a7f1f44d7
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/TimingIdentifier.java
|
||||
@@ -0,0 +1,106 @@
|
||||
|
@ -1186,7 +1186,7 @@ index 00000000..a7f1f44d
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
|
||||
new file mode 100644
|
||||
index 00000000..f907649b
|
||||
index 000000000..f907649ba
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/Timings.java
|
||||
@@ -0,0 +1,284 @@
|
||||
|
@ -1476,7 +1476,7 @@ index 00000000..f907649b
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java
|
||||
new file mode 100644
|
||||
index 00000000..56b10e89
|
||||
index 000000000..56b10e898
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/TimingsCommand.java
|
||||
@@ -0,0 +1,119 @@
|
||||
|
@ -1601,7 +1601,7 @@ index 00000000..56b10e89
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
|
||||
new file mode 100644
|
||||
index 00000000..df7f4259
|
||||
index 000000000..df7f42595
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
|
||||
@@ -0,0 +1,342 @@
|
||||
|
@ -1949,7 +1949,7 @@ index 00000000..df7f4259
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/TimingsManager.java b/src/main/java/co/aikar/timings/TimingsManager.java
|
||||
new file mode 100644
|
||||
index 00000000..f63e7033
|
||||
index 000000000..f63e7033c
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/TimingsManager.java
|
||||
@@ -0,0 +1,187 @@
|
||||
|
@ -2142,7 +2142,7 @@ index 00000000..f63e7033
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/TimingsReportListener.java b/src/main/java/co/aikar/timings/TimingsReportListener.java
|
||||
new file mode 100644
|
||||
index 00000000..e7c389c0
|
||||
index 000000000..e7c389c05
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/TimingsReportListener.java
|
||||
@@ -0,0 +1,72 @@
|
||||
|
@ -2220,7 +2220,7 @@ index 00000000..e7c389c0
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/UnsafeTimingHandler.java b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
|
||||
new file mode 100644
|
||||
index 00000000..5edaba12
|
||||
index 000000000..5edaba128
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
|
||||
@@ -0,0 +1,51 @@
|
||||
|
@ -2277,7 +2277,7 @@ index 00000000..5edaba12
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/util/Counter.java b/src/main/java/co/aikar/util/Counter.java
|
||||
new file mode 100644
|
||||
index 00000000..23ac07f2
|
||||
index 000000000..23ac07f2c
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/util/Counter.java
|
||||
@@ -0,0 +1,35 @@
|
||||
|
@ -2318,7 +2318,7 @@ index 00000000..23ac07f2
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/util/JSONUtil.java b/src/main/java/co/aikar/util/JSONUtil.java
|
||||
new file mode 100644
|
||||
index 00000000..96274975
|
||||
index 000000000..962749750
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/util/JSONUtil.java
|
||||
@@ -0,0 +1,129 @@
|
||||
|
@ -2453,7 +2453,7 @@ index 00000000..96274975
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/util/LoadingIntMap.java b/src/main/java/co/aikar/util/LoadingIntMap.java
|
||||
new file mode 100644
|
||||
index 00000000..24eae4be
|
||||
index 000000000..24eae4bea
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/util/LoadingIntMap.java
|
||||
@@ -0,0 +1,71 @@
|
||||
|
@ -2530,7 +2530,7 @@ index 00000000..24eae4be
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/util/LoadingMap.java b/src/main/java/co/aikar/util/LoadingMap.java
|
||||
new file mode 100644
|
||||
index 00000000..9a4f9dca
|
||||
index 000000000..9a4f9dca8
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/util/LoadingMap.java
|
||||
@@ -0,0 +1,339 @@
|
||||
|
@ -2875,7 +2875,7 @@ index 00000000..9a4f9dca
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/util/MRUMapCache.java b/src/main/java/co/aikar/util/MRUMapCache.java
|
||||
new file mode 100644
|
||||
index 00000000..df592d85
|
||||
index 000000000..df592d855
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/util/MRUMapCache.java
|
||||
@@ -0,0 +1,102 @@
|
||||
|
@ -2982,7 +2982,7 @@ index 00000000..df592d85
|
|||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index b90cbaed..52ce3cd4 100644
|
||||
index 58f3efe09..38e629193 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -572,7 +572,6 @@ public final class Bukkit {
|
||||
|
@ -2994,10 +2994,10 @@ index b90cbaed..52ce3cd4 100644
|
|||
|
||||
/**
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 58a1ee61..6572f3ac 100644
|
||||
index 23e7e4173..e2ac40dcb 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1154,12 +1154,27 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1178,12 +1178,27 @@ public interface Server extends PluginMessageRecipient {
|
||||
// Spigot start
|
||||
public class Spigot
|
||||
{
|
||||
|
@ -3028,7 +3028,7 @@ index 58a1ee61..6572f3ac 100644
|
|||
*
|
||||
diff --git a/src/main/java/org/bukkit/command/BufferedCommandSender.java b/src/main/java/org/bukkit/command/BufferedCommandSender.java
|
||||
new file mode 100644
|
||||
index 00000000..fd452bce
|
||||
index 000000000..fd452bce4
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/org/bukkit/command/BufferedCommandSender.java
|
||||
@@ -0,0 +1,18 @@
|
||||
|
@ -3051,7 +3051,7 @@ index 00000000..fd452bce
|
|||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
|
||||
index 33e8681d..db7f4428 100644
|
||||
index 33e8681d6..db7f44289 100644
|
||||
--- a/src/main/java/org/bukkit/command/Command.java
|
||||
+++ b/src/main/java/org/bukkit/command/Command.java
|
||||
@@ -33,7 +33,8 @@ public abstract class Command {
|
||||
|
@ -3081,7 +3081,7 @@ index 33e8681d..db7f4428 100644
|
|||
return true;
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
|
||||
index 50257883..9c80f464 100644
|
||||
index 502578837..9c80f4640 100644
|
||||
--- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
|
||||
+++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
|
||||
@@ -9,6 +9,7 @@ public class FormattedCommandAlias extends Command {
|
||||
|
@ -3104,7 +3104,7 @@ index 50257883..9c80f464 100644
|
|||
}
|
||||
diff --git a/src/main/java/org/bukkit/command/MessageCommandSender.java b/src/main/java/org/bukkit/command/MessageCommandSender.java
|
||||
new file mode 100644
|
||||
index 00000000..5527e7c8
|
||||
index 000000000..5527e7c86
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/org/bukkit/command/MessageCommandSender.java
|
||||
@@ -0,0 +1,105 @@
|
||||
|
@ -3214,7 +3214,7 @@ index 00000000..5527e7c8
|
|||
+
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
index d9183db2..43e52a77 100644
|
||||
index d9183db2f..43e52a77a 100644
|
||||
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
@@ -29,7 +29,7 @@ public class SimpleCommandMap implements CommandMap {
|
||||
|
@ -3249,7 +3249,7 @@ index d9183db2..43e52a77 100644
|
|||
// Note: we don't return the result of target.execute as thats success / failure, we return handled (true) or not handled (false)
|
||||
diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
|
||||
deleted file mode 100644
|
||||
index bba914d7..00000000
|
||||
index bba914d7f..000000000
|
||||
--- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
|
||||
+++ /dev/null
|
||||
@@ -1,253 +0,0 @@
|
||||
|
@ -3507,7 +3507,7 @@ index bba914d7..00000000
|
|||
- // Spigot end
|
||||
-}
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index 71fe947b..75f21146 100644
|
||||
index 71fe947bc..75f21146c 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -1551,6 +1551,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
|
@ -3523,7 +3523,7 @@ index 71fe947b..75f21146 100644
|
|||
|
||||
@Override
|
||||
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
index 8b130abb..80c152ba 100644
|
||||
index 8b130abb7..80c152ba9 100644
|
||||
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
@@ -293,7 +293,6 @@ public final class SimplePluginManager implements PluginManager {
|
||||
|
@ -3580,7 +3580,7 @@ index 8b130abb..80c152ba 100644
|
|||
}
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||
index 2d4c75ab..54594546 100644
|
||||
index 2d4c75ab2..545945468 100644
|
||||
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||
@@ -41,7 +41,6 @@ import org.bukkit.plugin.PluginLoader;
|
||||
|
@ -3629,7 +3629,7 @@ index 2d4c75ab..54594546 100644
|
|||
eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
|
||||
} else {
|
||||
diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
|
||||
index 7a8abe75..bc33ff33 100644
|
||||
index 7a8abe75a..bc33ff33a 100644
|
||||
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
|
||||
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
|
||||
@@ -23,7 +23,8 @@ import org.bukkit.plugin.PluginDescriptionFile;
|
||||
|
@ -3643,7 +3643,7 @@ index 7a8abe75..bc33ff33 100644
|
|||
private final Map<String, Class<?>> classes = new ConcurrentHashMap<String, Class<?>>();
|
||||
private final PluginDescriptionFile description;
|
||||
diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java
|
||||
index 5ca863b3..04804706 100644
|
||||
index 5ca863b36..048047067 100644
|
||||
--- a/src/main/java/org/bukkit/util/CachedServerIcon.java
|
||||
+++ b/src/main/java/org/bukkit/util/CachedServerIcon.java
|
||||
@@ -12,4 +12,6 @@ import org.bukkit.event.server.ServerListPingEvent;
|
||||
|
@ -3655,7 +3655,7 @@ index 5ca863b3..04804706 100644
|
|||
+ public String getData(); // Spigot
|
||||
+}
|
||||
diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java
|
||||
index 8d982974..e9f76006 100644
|
||||
index 8d982974e..e9f76006e 100644
|
||||
--- a/src/main/java/org/spigotmc/CustomTimingsHandler.java
|
||||
+++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java
|
||||
@@ -1,165 +1,105 @@
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 96b07d31cd5a0d02af4482fc3e8141ec8b360c8e Mon Sep 17 00:00:00 2001
|
||||
From 06f6137e4b84d9d2a2e29b74cc652e0d66845d3a Mon Sep 17 00:00:00 2001
|
||||
From: kashike <kashike@vq.lc>
|
||||
Date: Mon, 29 Feb 2016 19:48:59 -0600
|
||||
Subject: [PATCH] Expose server CommandMap
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index 8a6529f3..d4b7c539 100644
|
||||
index e1ce29328..e4d945830 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1394,6 +1394,17 @@ public final class Bukkit {
|
||||
@@ -1420,6 +1420,17 @@ public final class Bukkit {
|
||||
return server.getUnsafe();
|
||||
}
|
||||
|
||||
|
@ -27,7 +27,7 @@ index 8a6529f3..d4b7c539 100644
|
|||
{
|
||||
return server.spigot();
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 9651a45c..b9a75b2d 100644
|
||||
index fea2ad6f4..29e3feb1e 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1065,6 +1065,14 @@ public interface Server extends PluginMessageRecipient {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 91a807a7fbb2e9081a9c0311ca3cd801bd6a3bb0 Mon Sep 17 00:00:00 2001
|
||||
From 143887eadf9d0909f4093ef48ef2207f67a07389 Mon Sep 17 00:00:00 2001
|
||||
From: William <admin@domnian.com>
|
||||
Date: Fri, 18 Mar 2016 03:28:07 -0400
|
||||
Subject: [PATCH] Add command to reload permissions.yml and require confirm to
|
||||
|
@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
|
|||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index f14339af..60e7ceb6 100644
|
||||
index e38b16c2b..e1704ae2a 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1423,6 +1423,13 @@ public final class Bukkit {
|
||||
@@ -1449,6 +1449,13 @@ public final class Bukkit {
|
||||
public static org.bukkit.command.CommandMap getCommandMap() {
|
||||
return server.getCommandMap();
|
||||
}
|
||||
|
@ -24,10 +24,10 @@ index f14339af..60e7ceb6 100644
|
|||
|
||||
public static Server.Spigot spigot()
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index ce369aa3..2c07e6a2 100644
|
||||
index dee814eed..89f68d58e 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1240,4 +1240,6 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1264,4 +1264,6 @@ public interface Server extends PluginMessageRecipient {
|
||||
|
||||
Spigot spigot();
|
||||
// Spigot end
|
||||
|
@ -35,7 +35,7 @@ index ce369aa3..2c07e6a2 100644
|
|||
+ void reloadPermissions(); // Paper
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
|
||||
index 0ab7e295..f331a442 100644
|
||||
index 0ab7e295d..f331a4423 100644
|
||||
--- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
|
||||
+++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
|
||||
@@ -13,15 +13,36 @@ public class ReloadCommand extends BukkitCommand {
|
||||
|
@ -87,7 +87,7 @@ index 0ab7e295..f331a442 100644
|
|||
}
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
index b88f31ca..bd0588a2 100644
|
||||
index b88f31ca2..bd0588a20 100644
|
||||
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
@@ -763,4 +763,13 @@ public final class SimplePluginManager implements PluginManager {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 9fa647183cd2baf1c91e1138b8da71cab372831a Mon Sep 17 00:00:00 2001
|
||||
From 91f8d92c9957a90a8f35f0459b3775b7e592b4ba Mon Sep 17 00:00:00 2001
|
||||
From: willies952002 <admin@domnian.com>
|
||||
Date: Mon, 28 Nov 2016 10:16:39 -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/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index 60e7ceb6..66ebbaf7 100644
|
||||
index e1704ae2a..a312a662b 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1430,6 +1430,15 @@ public final class Bukkit {
|
||||
@@ -1456,6 +1456,15 @@ public final class Bukkit {
|
||||
public static void reloadPermissions() {
|
||||
server.reloadPermissions();
|
||||
}
|
||||
|
@ -26,10 +26,10 @@ index 60e7ceb6..66ebbaf7 100644
|
|||
|
||||
public static Server.Spigot spigot()
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 2c07e6a2..2fbee277 100644
|
||||
index 89f68d58e..a03591829 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1242,4 +1242,6 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1266,4 +1266,6 @@ public interface Server extends PluginMessageRecipient {
|
||||
// Spigot end
|
||||
|
||||
void reloadPermissions(); // Paper
|
||||
|
@ -37,7 +37,7 @@ index 2c07e6a2..2fbee277 100644
|
|||
+ boolean reloadCommandAliases(); // Paper
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/command/CommandMap.java b/src/main/java/org/bukkit/command/CommandMap.java
|
||||
index 30d60247..938959aa 100644
|
||||
index 30d60247e..938959aa5 100644
|
||||
--- a/src/main/java/org/bukkit/command/CommandMap.java
|
||||
+++ b/src/main/java/org/bukkit/command/CommandMap.java
|
||||
@@ -123,4 +123,13 @@ public interface CommandMap {
|
||||
|
@ -55,7 +55,7 @@ index 30d60247..938959aa 100644
|
|||
+ // Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
index 65ad78c4..41e95692 100644
|
||||
index 65ad78c48..41e95692e 100644
|
||||
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
@@ -279,4 +279,10 @@ public class SimpleCommandMap implements CommandMap {
|
||||
|
@ -70,7 +70,7 @@ index 65ad78c4..41e95692 100644
|
|||
+ // Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
|
||||
index f331a442..a977045d 100644
|
||||
index f331a4423..a977045de 100644
|
||||
--- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
|
||||
+++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
|
||||
@@ -13,7 +13,7 @@ public class ReloadCommand extends BukkitCommand {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 5c7930d6c02a578a42cac2d5940d4b3802923674 Mon Sep 17 00:00:00 2001
|
||||
From 33948f129f2c80ab0d7cc19602b603be14e730f3 Mon Sep 17 00:00:00 2001
|
||||
From: kashike <kashike@vq.lc>
|
||||
Date: Fri, 9 Jun 2017 07:24:24 -0700
|
||||
Subject: [PATCH] Add configuration option to prevent player names from being
|
||||
|
@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being
|
|||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index 66ebbaf7..06d1725d 100644
|
||||
index a312a662b..41cd3dba2 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1439,6 +1439,16 @@ public final class Bukkit {
|
||||
@@ -1465,6 +1465,16 @@ public final class Bukkit {
|
||||
public static boolean reloadCommandAliases() {
|
||||
return server.reloadCommandAliases();
|
||||
}
|
||||
|
@ -27,10 +27,10 @@ index 66ebbaf7..06d1725d 100644
|
|||
|
||||
public static Server.Spigot spigot()
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 2fbee277..edadec3f 100644
|
||||
index a03591829..46502ede1 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1244,4 +1244,14 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1268,4 +1268,14 @@ public interface Server extends PluginMessageRecipient {
|
||||
void reloadPermissions(); // Paper
|
||||
|
||||
boolean reloadCommandAliases(); // Paper
|
||||
|
@ -46,7 +46,7 @@ index 2fbee277..edadec3f 100644
|
|||
+ // Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/command/PluginCommand.java b/src/main/java/org/bukkit/command/PluginCommand.java
|
||||
index 2abe1208..c660c178 100644
|
||||
index 2abe1208f..c660c178c 100644
|
||||
--- a/src/main/java/org/bukkit/command/PluginCommand.java
|
||||
+++ b/src/main/java/org/bukkit/command/PluginCommand.java
|
||||
@@ -145,6 +145,7 @@ public final class PluginCommand extends Command implements PluginIdentifiableCo
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From b6914c6a90828e0fba1c673bc2dd43a32b7c28ca Mon Sep 17 00:00:00 2001
|
||||
From ce7a08b7515e5720254f32939db266a4df6d908b Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 15 Jan 2018 21:46:46 -0500
|
||||
Subject: [PATCH] Basic PlayerProfile API
|
||||
|
@ -7,7 +7,7 @@ Provides basic elements of a PlayerProfile to be used by future API/events
|
|||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
|
||||
new file mode 100644
|
||||
index 00000000..529c5376
|
||||
index 000000000..529c53760
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
|
||||
@@ -0,0 +1,142 @@
|
||||
|
@ -155,7 +155,7 @@ index 00000000..529c5376
|
|||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
|
||||
new file mode 100644
|
||||
index 00000000..d17061e6
|
||||
index 000000000..d17061e66
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/profile/ProfileProperty.java
|
||||
@@ -0,0 +1,72 @@
|
||||
|
@ -232,7 +232,7 @@ index 00000000..d17061e6
|
|||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index 06d1725d..bc04472e 100644
|
||||
index 41cd3dba2..f13d80cf2 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -51,6 +51,9 @@ import org.bukkit.generator.ChunkGenerator;
|
||||
|
@ -245,7 +245,7 @@ index 06d1725d..bc04472e 100644
|
|||
/**
|
||||
* Represents the Bukkit core, for version and Server singleton handling
|
||||
*/
|
||||
@@ -1449,6 +1452,37 @@ public final class Bukkit {
|
||||
@@ -1475,6 +1478,37 @@ public final class Bukkit {
|
||||
public static boolean suggestPlayerNamesWhenNullTabCompletions() {
|
||||
return server.suggestPlayerNamesWhenNullTabCompletions();
|
||||
}
|
||||
|
@ -284,7 +284,7 @@ index 06d1725d..bc04472e 100644
|
|||
|
||||
public static Server.Spigot spigot()
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index edadec3f..9f3ffb16 100644
|
||||
index 46502ede1..198107081 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -52,6 +52,9 @@ import org.bukkit.generator.ChunkGenerator;
|
||||
|
@ -297,7 +297,7 @@ index edadec3f..9f3ffb16 100644
|
|||
/**
|
||||
* Represents a server implementation.
|
||||
*/
|
||||
@@ -1253,5 +1256,30 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1277,5 +1280,30 @@ public interface Server extends PluginMessageRecipient {
|
||||
* @return true if player names should be suggested
|
||||
*/
|
||||
boolean suggestPlayerNamesWhenNullTabCompletions();
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 517f55139989739289d2423bf74eee73f855e8a3 Mon Sep 17 00:00:00 2001
|
||||
From abcb626661610f113fe89edb1e31532f751b869e Mon Sep 17 00:00:00 2001
|
||||
From: Shane Freeder <theboyetronic@gmail.com>
|
||||
Date: Sun, 18 Nov 2018 19:44:54 +0000
|
||||
Subject: [PATCH] Make the default permission message configurable
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index bd246827..f456f5a0 100644
|
||||
index 4acaefa4c..9fab69137 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1467,6 +1467,14 @@ public final class Bukkit {
|
||||
@@ -1493,6 +1493,14 @@ public final class Bukkit {
|
||||
return server.suggestPlayerNamesWhenNullTabCompletions();
|
||||
}
|
||||
|
||||
|
@ -24,10 +24,10 @@ index bd246827..f456f5a0 100644
|
|||
* Creates a PlayerProfile for the specified uuid, with name as null
|
||||
* @param uuid UUID to create profile for
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 5eb1d371..238f583d 100644
|
||||
index c940f6db9..ae15b0e99 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -1269,6 +1269,12 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -1293,6 +1293,12 @@ public interface Server extends PluginMessageRecipient {
|
||||
*/
|
||||
boolean suggestPlayerNamesWhenNullTabCompletions();
|
||||
|
||||
|
@ -41,7 +41,7 @@ index 5eb1d371..238f583d 100644
|
|||
* Creates a PlayerProfile for the specified uuid, with name as null
|
||||
* @param uuid UUID to create profile for
|
||||
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
|
||||
index db7f4428..77171cd1 100644
|
||||
index db7f44289..77171cd17 100644
|
||||
--- a/src/main/java/org/bukkit/command/Command.java
|
||||
+++ b/src/main/java/org/bukkit/command/Command.java
|
||||
@@ -180,7 +180,7 @@ public abstract class Command {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 567d98f00316e16d3b6f160192698352e97371aa Mon Sep 17 00:00:00 2001
|
||||
From e603fafdb02e4a80f5ff875bdb4c0fdcd928eeca 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
|
||||
|
@ -531,7 +531,7 @@ index 64a6a681f..ad9c00bc8 100644
|
|||
DedicatedServer.LOGGER.info("Generating keypair");
|
||||
this.a(MinecraftEncryption.b());
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 9ebafa6b9..0fac63db0 100644
|
||||
index 22be0e422..33229f45d 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -133,9 +133,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
|
||||
|
@ -593,10 +593,10 @@ index 6ea9eaa1a..5531f5205 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 fc49882c2..f31b18dd2 100644
|
||||
index b9f8caa80..ff9dc23c7 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -753,6 +753,7 @@ public final class CraftServer implements Server {
|
||||
@@ -755,6 +755,7 @@ public final class CraftServer implements Server {
|
||||
}
|
||||
|
||||
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
|
||||
|
@ -604,7 +604,7 @@ index fc49882c2..f31b18dd2 100644
|
|||
for (WorldServer world : console.getWorlds()) {
|
||||
world.worldData.setDifficulty(difficulty);
|
||||
world.setSpawnFlags(monsters, animals);
|
||||
@@ -768,6 +769,7 @@ public final class CraftServer implements Server {
|
||||
@@ -770,6 +771,7 @@ public final class CraftServer implements Server {
|
||||
world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
|
||||
}
|
||||
world.spigotConfig.init(); // Spigot
|
||||
|
@ -612,7 +612,7 @@ index fc49882c2..f31b18dd2 100644
|
|||
}
|
||||
|
||||
pluginManager.clearPlugins();
|
||||
@@ -775,6 +777,7 @@ public final class CraftServer implements Server {
|
||||
@@ -777,6 +779,7 @@ public final class CraftServer implements Server {
|
||||
resetRecipes();
|
||||
reloadData();
|
||||
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
|
||||
|
@ -620,7 +620,7 @@ index fc49882c2..f31b18dd2 100644
|
|||
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
|
||||
ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
|
||||
|
||||
@@ -1972,4 +1975,26 @@ public final class CraftServer implements Server {
|
||||
@@ -1993,4 +1996,26 @@ public final class CraftServer implements Server {
|
||||
{
|
||||
return spigot;
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 91dad8baaa433762ab478445014308c044e967b5 Mon Sep 17 00:00:00 2001
|
||||
From f716ee5f3b705d56bb2a134590c5c6c1d87e1b51 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
|
||||
|
@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
|
|||
|
||||
diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
|
||||
new file mode 100644
|
||||
index 0000000000..66d02e048b
|
||||
index 000000000..66d02e048
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
|
||||
@@ -0,0 +1,132 @@
|
||||
|
@ -144,7 +144,7 @@ index 0000000000..66d02e048b
|
|||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
|
||||
new file mode 100644
|
||||
index 0000000000..145cb274b0
|
||||
index 000000000..145cb274b
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
|
||||
@@ -0,0 +1,104 @@
|
||||
|
@ -253,7 +253,7 @@ index 0000000000..145cb274b0
|
|||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
index c4c1877d59..1256a0d589 100644
|
||||
index c4c1877d5..1256a0d58 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;
|
||||
|
@ -297,7 +297,7 @@ index c4c1877d59..1256a0d589 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
|
||||
index c09961be9b..dbf1089bac 100644
|
||||
index c09961be9..dbf1089ba 100644
|
||||
--- a/src/main/java/net/minecraft/server/Block.java
|
||||
+++ b/src/main/java/net/minecraft/server/Block.java
|
||||
@@ -22,6 +22,15 @@ public class Block implements IMaterial {
|
||||
|
@ -317,7 +317,7 @@ index c09961be9b..dbf1089bac 100644
|
|||
private final float frictionFactor;
|
||||
protected final BlockStateList<Block, IBlockData> blockStateList;
|
||||
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
||||
index 23dee9b563..eca1284cc3 100644
|
||||
index 23dee9b56..eca1284cc 100644
|
||||
--- a/src/main/java/net/minecraft/server/Chunk.java
|
||||
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
||||
@@ -854,6 +854,7 @@ public class Chunk implements IChunkAccess {
|
||||
|
@ -337,7 +337,7 @@ index 23dee9b563..eca1284cc3 100644
|
|||
}
|
||||
// CraftBukkit end
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
|
||||
index df2711a5f8..732c8793e5 100644
|
||||
index df2711a5f..732c8793e 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkMap.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkMap.java
|
||||
@@ -14,6 +14,7 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
|
||||
|
@ -357,7 +357,7 @@ index df2711a5f8..732c8793e5 100644
|
|||
|
||||
return chunk1;
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
index a8cdcb7da8..eb83e20d50 100644
|
||||
index a8cdcb7da..eb83e20d5 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
@@ -88,7 +88,7 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
|
@ -398,7 +398,7 @@ index a8cdcb7da8..eb83e20d50 100644
|
|||
this.chunkLoader.saveChunk(this.world, ichunkaccess, unloaded); // Spigot
|
||||
} catch (IOException ioexception) {
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||
index 8e5ce6c181..35976a26f3 100644
|
||||
index 8e5ce6c18..35976a26f 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||
@@ -1,5 +1,6 @@
|
||||
|
@ -445,7 +445,7 @@ index 8e5ce6c181..35976a26f3 100644
|
|||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/CustomFunction.java b/src/main/java/net/minecraft/server/CustomFunction.java
|
||||
index 65574eb2e5..bc87cfc4b6 100644
|
||||
index 65574eb2e..bc87cfc4b 100644
|
||||
--- a/src/main/java/net/minecraft/server/CustomFunction.java
|
||||
+++ b/src/main/java/net/minecraft/server/CustomFunction.java
|
||||
@@ -12,12 +12,22 @@ public class CustomFunction {
|
||||
|
@ -472,7 +472,7 @@ index 65574eb2e5..bc87cfc4b6 100644
|
|||
return this.b;
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java
|
||||
index f28f4f3cd3..6b417be1dd 100644
|
||||
index f28f4f3cd..6b417be1d 100644
|
||||
--- a/src/main/java/net/minecraft/server/CustomFunctionData.java
|
||||
+++ b/src/main/java/net/minecraft/server/CustomFunctionData.java
|
||||
@@ -100,7 +100,7 @@ public class CustomFunctionData implements ITickable, IResourcePackListener {
|
||||
|
@ -485,7 +485,7 @@ index f28f4f3cd3..6b417be1dd 100644
|
|||
int j = 0;
|
||||
CustomFunction.c[] acustomfunction_c = customfunction.b();
|
||||
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
index ad9c00bc80..4e9ef43b45 100644
|
||||
index ad9c00bc8..4e9ef43b4 100644
|
||||
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
@@ -29,7 +29,7 @@ import org.apache.logging.log4j.Level;
|
||||
|
@ -538,7 +538,7 @@ index ad9c00bc80..4e9ef43b45 100644
|
|||
return waitable.get();
|
||||
} catch (java.util.concurrent.ExecutionException e) {
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index faf4d0c0db..e329c2f48a 100644
|
||||
index faf4d0c0d..e329c2f48 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -27,7 +27,8 @@ import org.bukkit.command.CommandSender;
|
||||
|
@ -577,7 +577,7 @@ index faf4d0c0db..e329c2f48a 100644
|
|||
|
||||
protected float ab() {
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index ed859ccf95..31bbbbd969 100644
|
||||
index ed859ccf9..31bbbbd96 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -32,7 +32,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
|
||||
|
@ -653,7 +653,7 @@ index ed859ccf95..31bbbbd969 100644
|
|||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
|
||||
index cd462f7dfc..45ab33d1ae 100644
|
||||
index cd462f7df..45ab33d1a 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityTracker.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityTracker.java
|
||||
@@ -168,7 +168,7 @@ public class EntityTracker {
|
||||
|
@ -684,7 +684,7 @@ index cd462f7dfc..45ab33d1ae 100644
|
|||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index 72de40434f..7e89d7158b 100644
|
||||
index 72de40434..7e89d7158 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -1,5 +1,6 @@
|
||||
|
@ -837,7 +837,7 @@ index 72de40434f..7e89d7158b 100644
|
|||
this.methodProfiler.exit();
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
index c24f4a8fea..e01222ad2b 100644
|
||||
index c24f4a8fe..e01222ad2 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
@@ -1,5 +1,6 @@
|
||||
|
@ -929,7 +929,7 @@ index c24f4a8fea..e01222ad2b 100644
|
|||
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index 08d1b859d9..13453bd5e0 100644
|
||||
index f9e5103a3..d2970c086 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory;
|
||||
|
@ -984,7 +984,7 @@ index 08d1b859d9..13453bd5e0 100644
|
|||
// this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s);
|
||||
// CraftBukkit end
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
|
||||
index 6c88d0c86a..8bf94c1b96 100644
|
||||
index 6c88d0c86..8bf94c1b9 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
|
||||
@@ -1,11 +1,17 @@
|
||||
|
@ -1006,7 +1006,7 @@ index 6c88d0c86a..8bf94c1b96 100644
|
|||
throw CancelledPacketHandleException.INSTANCE;
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
index 54e44cba35..3a83819d56 100644
|
||||
index 54e44cba3..3a83819d5 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
@@ -1,5 +1,6 @@
|
||||
|
@ -1030,7 +1030,7 @@ index 54e44cba35..3a83819d56 100644
|
|||
|
||||
public WhiteList getWhitelist() {
|
||||
diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java
|
||||
index 0da57948a3..6571fc5952 100644
|
||||
index 0da57948a..6571fc595 100644
|
||||
--- a/src/main/java/net/minecraft/server/TickListServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/TickListServer.java
|
||||
@@ -24,13 +24,19 @@ public class TickListServer<T> implements TickList<T> {
|
||||
|
@ -1084,7 +1084,7 @@ index 0da57948a3..6571fc5952 100644
|
|||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
|
||||
index c69209497b..68ac014aab 100644
|
||||
index c69209497..68ac014aa 100644
|
||||
--- a/src/main/java/net/minecraft/server/TileEntity.java
|
||||
+++ b/src/main/java/net/minecraft/server/TileEntity.java
|
||||
@@ -4,12 +4,13 @@ import javax.annotation.Nullable;
|
||||
|
@ -1104,7 +1104,7 @@ index c69209497b..68ac014aab 100644
|
|||
private final TileEntityTypes<?> e; public TileEntityTypes getTileEntityType() { return e; } // Paper - OBFHELPER
|
||||
protected World world;
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index 5531f5205e..209091a9cb 100644
|
||||
index 5531f5205..209091a9c 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -1,5 +1,6 @@
|
||||
|
@ -1212,7 +1212,7 @@ index 5531f5205e..209091a9cb 100644
|
|||
|
||||
public boolean a(@Nullable Entity entity, VoxelShape voxelshape) {
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index a7ae16681d..5a7087c758 100644
|
||||
index a7ae16681..5a7087c75 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -1,5 +1,6 @@
|
||||
|
@ -1314,10 +1314,10 @@ index a7ae16681d..5a7087c758 100644
|
|||
|
||||
// CraftBukkit start
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index f31b18dd2c..1a2473541d 100644
|
||||
index ff9dc23c7..6a2962aca 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1945,12 +1945,31 @@ public final class CraftServer implements Server {
|
||||
@@ -1966,12 +1966,31 @@ public final class CraftServer implements Server {
|
||||
private final Spigot spigot = new Spigot()
|
||||
{
|
||||
|
||||
|
@ -1351,7 +1351,7 @@ index f31b18dd2c..1a2473541d 100644
|
|||
org.spigotmc.RestartCommand.restart();
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
|
||||
deleted file mode 100644
|
||||
index 2ab4b11a8d..0000000000
|
||||
index 2ab4b11a8..000000000
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
|
||||
+++ /dev/null
|
||||
@@ -1,173 +0,0 @@
|
||||
|
@ -1529,7 +1529,7 @@ index 2ab4b11a8d..0000000000
|
|||
- }
|
||||
-}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
|
||||
index 413dd35f06..52a8c48fa4 100644
|
||||
index 413dd35f0..52a8c48fa 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
|
||||
@@ -1,6 +1,8 @@
|
||||
|
@ -1565,7 +1565,7 @@ index 413dd35f06..52a8c48fa4 100644
|
|||
|
||||
public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 753704c87d..ca3393ef8f 100644
|
||||
index 753704c87..ca3393ef8 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1695,6 +1695,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
|
@ -1584,7 +1584,7 @@ index 753704c87d..ca3393ef8f 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 646128f16d..d75cc42e11 100644
|
||||
index 646128f16..d75cc42e1 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
||||
@@ -16,6 +16,7 @@ import java.util.concurrent.atomic.AtomicReference;
|
||||
|
@ -1651,7 +1651,7 @@ index 646128f16d..d75cc42e11 100644
|
|||
|
||||
private boolean isReady(final int currentTick) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
|
||||
index 3f55381c15..f32e660107 100644
|
||||
index 3f55381c1..f32e66010 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
|
||||
@@ -2,8 +2,8 @@ package org.bukkit.craftbukkit.scheduler;
|
||||
|
@ -1733,7 +1733,7 @@ index 3f55381c15..f32e660107 100644
|
|||
- // Spigot end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
|
||||
index e52ef47b78..3d90b34268 100644
|
||||
index e52ef47b7..3d90b3426 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
|
||||
@@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon;
|
||||
|
@ -1745,7 +1745,7 @@ index e52ef47b78..3d90b34268 100644
|
|||
this.value = value;
|
||||
}
|
||||
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
|
||||
index c1071c92ee..a99c0cea0f 100644
|
||||
index c1071c92e..a99c0cea0 100644
|
||||
--- a/src/main/java/org/spigotmc/ActivationRange.java
|
||||
+++ b/src/main/java/org/spigotmc/ActivationRange.java
|
||||
@@ -30,7 +30,7 @@ import net.minecraft.server.EntityWither;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 43b2ca579231f7a5b3d818e3c7c432c21961a3a2 Mon Sep 17 00:00:00 2001
|
||||
From bec23bb644bcb5b09362b38033cadf808d809038 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
|
||||
|
@ -32,10 +32,10 @@ index 7e89d7158..df85f35f3 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 1a2473541..bfe713aca 100644
|
||||
index 6a2962aca..e4b686063 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -162,7 +162,7 @@ import org.bukkit.event.server.TabCompleteEvent;
|
||||
@@ -164,7 +164,7 @@ import org.bukkit.event.server.TabCompleteEvent;
|
||||
import net.md_5.bungee.api.chat.BaseComponent;
|
||||
|
||||
public final class CraftServer implements Server {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From ac69fd8917339ada124d808ba27d05a40cd19fe6 Mon Sep 17 00:00:00 2001
|
||||
From 9f6313c8ff6c0a86ecb191030db583dd6e1b3f54 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
|
||||
|
@ -161,10 +161,10 @@ index df85f35f3..7ca7b9f3a 100644
|
|||
this.nextTick += 50L;
|
||||
// Spigot end
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index bfe713aca..a85d2a3c2 100644
|
||||
index e4b686063..a6d729180 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1942,6 +1942,17 @@ public final class CraftServer implements Server {
|
||||
@@ -1963,6 +1963,17 @@ public final class CraftServer implements Server {
|
||||
return CraftMagicNumbers.INSTANCE;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 74984e1c1136d6da89344b1efa368d8c6c70a9c8 Mon Sep 17 00:00:00 2001
|
||||
From 18827b7724628d83581906f398c7b311cd031417 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 13453bd5e..72719ea02 100644
|
||||
index d2970c086..00bd32e6c 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -1548,6 +1548,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
||||
|
@ -48,10 +48,10 @@ index 13453bd5e..72719ea02 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 a85d2a3c2..d8558e42f 100644
|
||||
index a6d729180..b713bd2e9 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -699,6 +699,29 @@ public final class CraftServer implements Server {
|
||||
@@ -701,6 +701,29 @@ public final class CraftServer implements Server {
|
||||
Validate.notNull(commandLine, "CommandLine cannot be null");
|
||||
org.spigotmc.AsyncCatcher.catchOp( "command dispatch" ); // Spigot
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 361868edfeb629c5a507c7d2db5ddcb2266f4774 Mon Sep 17 00:00:00 2001
|
||||
From 348a5f37b3bcf9c703a0837baa7b8b780ced4617 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 6700ce84c..71bd5bc71 100644
|
||||
index b713bd2e9..f4bce56ef 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1640,6 +1640,7 @@ public final class CraftServer implements Server {
|
||||
@@ -1642,6 +1642,7 @@ public final class CraftServer implements Server {
|
||||
return helpMap;
|
||||
}
|
||||
|
||||
|
@ -17,5 +17,5 @@ index 6700ce84c..71bd5bc71 100644
|
|||
return commandMap;
|
||||
}
|
||||
--
|
||||
2.20.0
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
From 28f85cba59d14521010bd7034f77d446210f32ab Mon Sep 17 00:00:00 2001
|
||||
From 30dd9067e9bb6bb564d5748e42cd31cbc12c1530 Mon Sep 17 00:00:00 2001
|
||||
From: Joseph Hirschfeld <joe@ibj.io>
|
||||
Date: Thu, 3 Mar 2016 02:48:12 -0600
|
||||
Subject: [PATCH] Add velocity warnings
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index cd17cdcf38..71bdbac134 100644
|
||||
index f4bce56ef..5dc92cb20 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -199,6 +199,7 @@ public final class CraftServer implements Server {
|
||||
@@ -201,6 +201,7 @@ public final class CraftServer implements Server {
|
||||
public boolean ignoreVanillaPermissions = false;
|
||||
private final List<CraftPlayer> playerView;
|
||||
public int reloadCount;
|
||||
|
@ -17,7 +17,7 @@ index cd17cdcf38..71bdbac134 100644
|
|||
private final class BooleanWrapper {
|
||||
private boolean value = true;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
index df7c77e9aa..2858f11eef 100644
|
||||
index 9a5bb0222..a82717f5c 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
@@ -265,12 +265,44 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
||||
|
@ -66,7 +66,7 @@ index df7c77e9aa..2858f11eef 100644
|
|||
public double getHeight() {
|
||||
return getHandle().length;
|
||||
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
|
||||
index 21316d67f1..5d03191c80 100644
|
||||
index 21316d67f..5d03191c8 100644
|
||||
--- a/src/main/java/org/spigotmc/WatchdogThread.java
|
||||
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
|
||||
@@ -76,7 +76,19 @@ public class WatchdogThread extends Thread
|
||||
|
@ -91,5 +91,5 @@ index 21316d67f1..5d03191c80 100644
|
|||
log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" );
|
||||
dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().primaryThread.getId(), Integer.MAX_VALUE ), log );
|
||||
--
|
||||
2.19.1
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 41ba00ca9074a003b86088667b6772c8253d5bbd Mon Sep 17 00:00:00 2001
|
||||
From 7a1ad987146ad3817d45fe917459d6a4dc6f814d 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 4aad68a57..dccd00127 100644
|
||||
index 6b3556c13..508327841 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
@@ -223,4 +223,9 @@ public class PaperConfig {
|
||||
|
@ -30,10 +30,10 @@ index 4aad68a57..dccd00127 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 71bdbac13..bbd8969db 100644
|
||||
index 5dc92cb20..b8aedaae6 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -340,6 +340,7 @@ public final class CraftServer implements Server {
|
||||
@@ -342,6 +342,7 @@ public final class CraftServer implements Server {
|
||||
if (type == PluginLoadOrder.STARTUP) {
|
||||
helpMap.clear();
|
||||
helpMap.initializeGeneralTopics();
|
||||
|
@ -41,7 +41,7 @@ index 71bdbac13..bbd8969db 100644
|
|||
}
|
||||
|
||||
Plugin[] plugins = pluginManager.getPlugins();
|
||||
@@ -357,7 +358,7 @@ public final class CraftServer implements Server {
|
||||
@@ -359,7 +360,7 @@ public final class CraftServer implements Server {
|
||||
setVanillaCommands(false);
|
||||
// Spigot end
|
||||
commandMap.registerServerAliases();
|
||||
|
@ -51,5 +51,5 @@ index 71bdbac13..bbd8969db 100644
|
|||
CraftDefaultPermissions.registerCorePermissions();
|
||||
helpMap.initializeCommands();
|
||||
--
|
||||
2.19.1
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From f3c64acdb1626e3c83b9b962dd648cc43426b85a Mon Sep 17 00:00:00 2001
|
||||
From 7d4d7ce747cd44a4d6410c323a5298a63a0452b7 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 bcd8ba4ad..70c3cde24 100644
|
||||
index b8aedaae6..b911220e7 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -2052,5 +2052,23 @@ public final class CraftServer implements Server {
|
||||
@@ -2073,5 +2073,23 @@ public final class CraftServer implements Server {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
@ -34,5 +34,5 @@ index bcd8ba4ad..70c3cde24 100644
|
|||
// Paper end
|
||||
}
|
||||
--
|
||||
2.20.0
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 280070162549146a5ab079891b05e6f34e1d2fba Mon Sep 17 00:00:00 2001
|
||||
From cbedcec343621db663f87db9845e8bcfdcf1550e 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 90177b72c..8f1da59c5 100644
|
||||
index b911220e7..8f31492cb 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -797,8 +797,18 @@ public final class CraftServer implements Server {
|
||||
@@ -799,8 +799,18 @@ public final class CraftServer implements Server {
|
||||
world.paperConfig.init(); // Paper
|
||||
}
|
||||
|
||||
|
@ -30,5 +30,5 @@ index 90177b72c..8f1da59c5 100644
|
|||
reloadData();
|
||||
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
|
||||
--
|
||||
2.19.1
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 04378504bd22fb7b9ec880a1556cdc9db4ff71da Mon Sep 17 00:00:00 2001
|
||||
From 36b26b9c6b8f8a53382fdefbc997dcd9fd158fb1 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
|
||||
|
@ -78,10 +78,10 @@ index 907681cdf..5aea44cd8 100644
|
|||
|
||||
public LongSet ag() {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index c8263868b..58909ea7a 100644
|
||||
index 8f31492cb..b64f3594a 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1004,7 +1004,7 @@ public final class CraftServer implements Server {
|
||||
@@ -1006,7 +1006,7 @@ public final class CraftServer implements Server {
|
||||
System.out.println("Preparing start region for level " + (console.worldServer.size() - 1) + " (Seed: " + internal.getSeed() + ")");
|
||||
|
||||
if (internal.getWorld().getKeepSpawnInMemory()) {
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
From f0eae946258127b451f577122aa6aa553651fa23 Mon Sep 17 00:00:00 2001
|
||||
From 9cb3962db832174ee0d087d5441333176d112591 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 e10055b7d..2ae623e7d 100644
|
||||
index 879951f24..894501c61 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
@@ -22,6 +22,7 @@ import org.bukkit.configuration.InvalidConfigurationException;
|
||||
|
@ -45,10 +45,10 @@ index bf67dbf54..dcaba3c40 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 c655d51ac..f90b708e4 100644
|
||||
index b64f3594a..c82cca49f 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1410,7 +1410,8 @@ public final class CraftServer implements Server {
|
||||
@@ -1412,7 +1412,8 @@ public final class CraftServer implements Server {
|
||||
// Spigot Start
|
||||
GameProfile profile = null;
|
||||
// Only fetch an online UUID in online mode
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From e786640212faf8e4bf9c96095614435bc3b948aa Mon Sep 17 00:00:00 2001
|
||||
From 477a9079889e96124c60a6994b2704a5b1f34ebe 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 f90b708e4..84c0a14ec 100644
|
||||
index c82cca49f..85a2b6244 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -2081,5 +2081,24 @@ public final class CraftServer implements Server {
|
||||
@@ -2102,5 +2102,24 @@ public final class CraftServer implements Server {
|
||||
DefaultPermissions.registerCorePermissions();
|
||||
CraftDefaultPermissions.registerCorePermissions();
|
||||
}
|
||||
|
@ -35,5 +35,5 @@ index f90b708e4..84c0a14ec 100644
|
|||
// Paper end
|
||||
}
|
||||
--
|
||||
2.20.0
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 765c04d1f89da22dc10a35695e836e105509f5a6 Mon Sep 17 00:00:00 2001
|
||||
From cfbfa03e2f499b2b315a0129d732b0556effc00e 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
|
||||
|
@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
|
|||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
index 9f8b43d2a..3f59e060b 100644
|
||||
index a4853e04b..0f38b1fb4 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
@@ -280,4 +280,9 @@ public class PaperConfig {
|
||||
|
@ -20,10 +20,10 @@ index 9f8b43d2a..3f59e060b 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 84c0a14ec..457dec91a 100644
|
||||
index 85a2b6244..ebfdc6213 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -2100,5 +2100,10 @@ public final class CraftServer implements Server {
|
||||
@@ -2121,5 +2121,10 @@ public final class CraftServer implements Server {
|
||||
commandMap.registerServerAliases();
|
||||
return true;
|
||||
}
|
||||
|
@ -35,5 +35,5 @@ index 84c0a14ec..457dec91a 100644
|
|||
// Paper end
|
||||
}
|
||||
--
|
||||
2.20.0
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 15e28d72f3c046e9bc532e048218675fac9c18f8 Mon Sep 17 00:00:00 2001
|
||||
From f0887ada1c154f79950b0326777dec68ebee521e Mon Sep 17 00:00:00 2001
|
||||
From: Minecrell <minecrell@minecrell.net>
|
||||
Date: Fri, 9 Jun 2017 19:03:43 +0200
|
||||
Subject: [PATCH] Use TerminalConsoleAppender for console improvements
|
||||
|
@ -19,7 +19,7 @@ Other changes:
|
|||
configuration
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 0305674eb0..bf1c2ab823 100644
|
||||
index 0305674eb..bf1c2ab82 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -41,10 +41,27 @@
|
||||
|
@ -75,7 +75,7 @@ index 0305674eb0..bf1c2ab823 100644
|
|||
<groupId>org.apache.maven.plugins</groupId>
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
|
||||
new file mode 100644
|
||||
index 0000000000..688b4715eb
|
||||
index 000000000..688b4715e
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
|
||||
@@ -0,0 +1,40 @@
|
||||
|
@ -121,7 +121,7 @@ index 0000000000..688b4715eb
|
|||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
|
||||
new file mode 100644
|
||||
index 0000000000..685deaa0e5
|
||||
index 000000000..685deaa0e
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
|
||||
@@ -0,0 +1,17 @@
|
||||
|
@ -143,7 +143,7 @@ index 0000000000..685deaa0e5
|
|||
+
|
||||
+}
|
||||
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
index 4e9ef43b45..5bb1ea880a 100644
|
||||
index 4e9ef43b4..5bb1ea880 100644
|
||||
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
||||
@@ -79,6 +79,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
||||
|
@ -185,7 +185,7 @@ index 4e9ef43b45..5bb1ea880a 100644
|
|||
System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
|
||||
System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index dd910b16d0..e046c2e334 100644
|
||||
index dd910b16d..e046c2e33 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -56,7 +56,6 @@ import org.apache.commons.lang3.Validate;
|
||||
|
@ -243,7 +243,7 @@ index dd910b16d0..e046c2e334 100644
|
|||
|
||||
public KeyPair E() {
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
index 9d44dcb3b2..8bb3fef21e 100644
|
||||
index 9d44dcb3b..8bb3fef21 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
@@ -77,8 +77,7 @@ public abstract class PlayerList {
|
||||
|
@ -257,10 +257,10 @@ index 9d44dcb3b2..8bb3fef21e 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 471da648f9..7430c27bcc 100644
|
||||
index ebfdc6213..89ff2fb53 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -144,8 +144,8 @@ import java.nio.ByteBuffer;
|
||||
@@ -146,8 +146,8 @@ import java.nio.ByteBuffer;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.Base64;
|
||||
import java.util.HashMap;
|
||||
|
@ -270,7 +270,7 @@ index 471da648f9..7430c27bcc 100644
|
|||
import org.bukkit.NamespacedKey;
|
||||
import org.bukkit.block.data.BlockData;
|
||||
import org.bukkit.craftbukkit.block.data.CraftBlockData;
|
||||
@@ -1152,9 +1152,13 @@ public final class CraftServer implements Server {
|
||||
@@ -1154,9 +1154,13 @@ public final class CraftServer implements Server {
|
||||
return logger;
|
||||
}
|
||||
|
||||
|
@ -285,7 +285,7 @@ index 471da648f9..7430c27bcc 100644
|
|||
@Override
|
||||
public PluginCommand getPluginCommand(String name) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
index 5c62e990ab..b174a4efae 100644
|
||||
index 5c62e990a..b174a4efa 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
@@ -14,7 +14,7 @@ import java.util.logging.Logger;
|
||||
|
@ -327,7 +327,7 @@ index 5c62e990ab..b174a4efae 100644
|
|||
if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
|
||||
deleted file mode 100644
|
||||
index 26a2fb8942..0000000000
|
||||
index 26a2fb894..000000000
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
|
||||
+++ /dev/null
|
||||
@@ -1,74 +0,0 @@
|
||||
|
@ -406,7 +406,7 @@ index 26a2fb8942..0000000000
|
|||
- }
|
||||
-}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
|
||||
index 33e8ea02c4..1e3aae3b8f 100644
|
||||
index 33e8ea02c..1e3aae3b8 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
|
||||
@@ -8,17 +8,27 @@ import java.util.logging.Level;
|
||||
|
@ -485,7 +485,7 @@ index 33e8ea02c4..1e3aae3b8f 100644
|
|||
}
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
|
||||
index 984df4083d..bbb5a84f36 100644
|
||||
index 984df4083..bbb5a84f3 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
|
||||
@@ -20,7 +20,7 @@ public class ServerShutdownThread extends Thread {
|
||||
|
@ -499,7 +499,7 @@ index 984df4083d..bbb5a84f36 100644
|
|||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
|
||||
deleted file mode 100644
|
||||
index b640971130..0000000000
|
||||
index b64097113..000000000
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
|
||||
+++ /dev/null
|
||||
@@ -1,54 +0,0 @@
|
||||
|
@ -558,7 +558,7 @@ index b640971130..0000000000
|
|||
- }
|
||||
-}
|
||||
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
|
||||
index 5cee8f00ef..08b6bb7f97 100644
|
||||
index 5cee8f00e..08b6bb7f9 100644
|
||||
--- a/src/main/resources/log4j2.xml
|
||||
+++ b/src/main/resources/log4j2.xml
|
||||
@@ -1,12 +1,11 @@
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
From c8f278f4c0620be9cbd282756ffea604fcdc5ae5 Mon Sep 17 00:00:00 2001
|
||||
From 7b5147f0f06ece4202a78ae8391ce5faef0ad8af 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 97fa98d2c..873170864 100644
|
||||
index 89ff2fb53..f82ab97e6 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -83,6 +83,7 @@ import org.bukkit.craftbukkit.util.Versioning;
|
||||
|
@ -16,7 +16,7 @@ index 97fa98d2c..873170864 100644
|
|||
import org.bukkit.event.inventory.InventoryType;
|
||||
import org.bukkit.event.player.PlayerChatTabCompleteEvent;
|
||||
import org.bukkit.event.server.BroadcastMessageEvent;
|
||||
@@ -730,7 +731,13 @@ public final class CraftServer implements Server {
|
||||
@@ -732,7 +733,13 @@ public final class CraftServer implements Server {
|
||||
|
||||
// Spigot start
|
||||
if (!org.spigotmc.SpigotConfig.unknownCommandMessage.isEmpty()) {
|
||||
|
@ -32,5 +32,5 @@ index 97fa98d2c..873170864 100644
|
|||
// Spigot end
|
||||
|
||||
--
|
||||
2.20.0
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 8ab00ebdbffdb6ffc278a616981ca70c981125ee Mon Sep 17 00:00:00 2001
|
||||
From e9d6a257393684f269c8b612ad29935f9359196a Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 15 Jan 2018 22:11:48 -0500
|
||||
Subject: [PATCH] Basic PlayerProfile API
|
||||
|
@ -486,10 +486,10 @@ index 9bf2521be..059665836 100644
|
|||
|
||||
private UserCacheEntry(GameProfile gameprofile, Date date) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 19ac5fdca..d4109898e 100644
|
||||
index f82ab97e6..c2e72dac2 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -162,6 +162,10 @@ import org.bukkit.event.server.ServerLoadEvent;
|
||||
@@ -164,6 +164,10 @@ import org.bukkit.event.server.ServerLoadEvent;
|
||||
import org.bukkit.event.server.TabCompleteEvent;
|
||||
import net.md_5.bungee.api.chat.BaseComponent;
|
||||
|
||||
|
@ -500,7 +500,7 @@ index 19ac5fdca..d4109898e 100644
|
|||
public final class CraftServer implements Server {
|
||||
private final String serverName = "Paper"; // Paper
|
||||
private final String serverVersion;
|
||||
@@ -2116,5 +2120,21 @@ public final class CraftServer implements Server {
|
||||
@@ -2137,5 +2141,21 @@ public final class CraftServer implements Server {
|
||||
public boolean suggestPlayerNamesWhenNullTabCompletions() {
|
||||
return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 1345d01ce3b92d6c6a1d347dddb3140bbdf03241 Mon Sep 17 00:00:00 2001
|
||||
From 4eedfa988b7e9b1d975fedfc09e4ac05fb071ac0 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sun, 26 Nov 2017 13:19:58 -0500
|
||||
Subject: [PATCH] AsyncTabCompleteEvent
|
||||
|
@ -14,7 +14,7 @@ completion, such as offline players.
|
|||
Also adds isCommand and getLocation to the sync TabCompleteEvent
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index 8def17495..1a2e8a8da 100644
|
||||
index 9afe20d40..59b0084c7 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -507,10 +507,10 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
|
||||
|
@ -69,10 +69,10 @@ index 8def17495..1a2e8a8da 100644
|
|||
|
||||
public void a(PacketPlayInSetCommandBlock packetplayinsetcommandblock) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index b5d0886df..054d3f3dc 100644
|
||||
index c2e72dac2..9cf5807ee 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1721,7 +1721,7 @@ public final class CraftServer implements Server {
|
||||
@@ -1723,7 +1723,7 @@ public final class CraftServer implements Server {
|
||||
offers = tabCompleteChat(player, message);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From a1af634f52b58bd1a460581e0281001fef1c06ab Mon Sep 17 00:00:00 2001
|
||||
From 37cc02d40b2b191de136bd4687556b1bde2015d1 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Thu, 22 Mar 2018 01:40:24 -0400
|
||||
Subject: [PATCH] getPlayerUniqueId API
|
||||
|
@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID
|
|||
This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 054d3f3dc..ec197ef51 100644
|
||||
index 9cf5807ee..296e338c8 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1414,6 +1414,26 @@ public final class CraftServer implements Server {
|
||||
@@ -1416,6 +1416,26 @@ public final class CraftServer implements Server {
|
||||
return recipients.size();
|
||||
}
|
||||
|
||||
|
@ -40,5 +40,5 @@ index 054d3f3dc..ec197ef51 100644
|
|||
@Deprecated
|
||||
public OfflinePlayer getOfflinePlayer(String name) {
|
||||
--
|
||||
2.20.0
|
||||
2.20.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 778ab79ec584b375233848669b420c2cf97a1d43 Mon Sep 17 00:00:00 2001
|
||||
From 7f98ea9490aaabaf4295ad4ef1f63ae99db850fd Mon Sep 17 00:00:00 2001
|
||||
From: miclebrick <miclebrick@outlook.com>
|
||||
Date: Wed, 8 Aug 2018 15:30:52 -0400
|
||||
Subject: [PATCH] Add Early Warning Feature to WatchDog
|
||||
|
@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash.
|
|||
This will help diagnose what was going on in that time before the crash.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
index a92914576..f3f2a0b69 100644
|
||||
index 975ebf75c..6bd59a886 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
@@ -25,6 +25,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
|
||||
|
@ -48,10 +48,10 @@ index c562ba546..e993b4da6 100644
|
|||
long start = System.nanoTime(), curTime, wait, tickSection = start; // Paper - Further improve server tick loop
|
||||
lastTick = start - TICK_TIME; // Paper
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 20c78e207..5372e9d54 100644
|
||||
index 296e338c8..bc7d39e26 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -750,6 +750,7 @@ public final class CraftServer implements Server {
|
||||
@@ -752,6 +752,7 @@ public final class CraftServer implements Server {
|
||||
|
||||
@Override
|
||||
public void reload() {
|
||||
|
@ -59,7 +59,7 @@ index 20c78e207..5372e9d54 100644
|
|||
reloadCount++;
|
||||
configuration = YamlConfiguration.loadConfiguration(getConfigFile());
|
||||
commandsConfiguration = YamlConfiguration.loadConfiguration(getCommandsConfigFile());
|
||||
@@ -855,6 +856,7 @@ public final class CraftServer implements Server {
|
||||
@@ -857,6 +858,7 @@ public final class CraftServer implements Server {
|
||||
enablePlugins(PluginLoadOrder.STARTUP);
|
||||
enablePlugins(PluginLoadOrder.POSTWORLD);
|
||||
getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.RELOAD));
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From f648f409ece71b0b16103bb43fb647591dcfb7b6 Mon Sep 17 00:00:00 2001
|
||||
From 597d2af0a40d03f1928c77a2bbe43655529a9fc1 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 17 Sep 2018 23:05:31 -0400
|
||||
Subject: [PATCH] Support Overriding World Seeds
|
||||
|
@ -15,7 +15,7 @@ This seed will end up being saved to the world data file, so it is
|
|||
a permanent change in that it won't go back if you remove it from paper.yml
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
index 6bd59a886d..359c538f32 100644
|
||||
index 6bd59a886..359c538f3 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
@@ -11,6 +11,7 @@ import java.lang.reflect.Modifier;
|
||||
|
@ -59,7 +59,7 @@ index 6bd59a886d..359c538f32 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index 6138c14eae..5393a11db0 100644
|
||||
index 6138c14ea..5393a11db 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -345,7 +345,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
|
||||
|
@ -72,7 +72,7 @@ index 6138c14eae..5393a11db0 100644
|
|||
|
||||
if (j == 0) {
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldData.java b/src/main/java/net/minecraft/server/WorldData.java
|
||||
index 8458dc17d4..b5fb95293e 100644
|
||||
index 8458dc17d..b5fb95293 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldData.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldData.java
|
||||
@@ -110,7 +110,7 @@ public class WorldData {
|
||||
|
@ -85,10 +85,10 @@ index 8458dc17d4..b5fb95293e 100644
|
|||
String s = nbttagcompound.getString("generatorName");
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 5372e9d540..18bc27ee66 100644
|
||||
index bc7d39e26..69bcc941e 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -987,7 +987,7 @@ public final class CraftServer implements Server {
|
||||
@@ -989,7 +989,7 @@ public final class CraftServer implements Server {
|
||||
WorldData worlddata = sdm.getWorldData();
|
||||
WorldSettings worldSettings = null;
|
||||
if (worlddata == null) {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 66ebfa5f368dcb5c0fc6c7861bd1fa4133d5a27e Mon Sep 17 00:00:00 2001
|
||||
From 0e6ec29dc3477ddae58d262913c67ecd0b33502c Mon Sep 17 00:00:00 2001
|
||||
From: Brokkonaut <hannos17@gmx.de>
|
||||
Date: Tue, 25 Sep 2018 06:53:43 +0200
|
||||
Subject: [PATCH] Avoid dimension id collisions
|
||||
|
@ -8,10 +8,10 @@ we would reuse an existing dimension id, if some other dimension was
|
|||
unloaded before.
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 18bc27ee66..4dabd31d96 100644
|
||||
index 69bcc941e..5fca9e4bd 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -973,7 +973,7 @@ public final class CraftServer implements Server {
|
||||
@@ -975,7 +975,7 @@ public final class CraftServer implements Server {
|
||||
boolean used = false;
|
||||
do {
|
||||
for (WorldServer server : console.getWorlds()) {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 17e3cdb6f3d0d395f60b6c8fa92dab6a703f1b36 Mon Sep 17 00:00:00 2001
|
||||
From 4dfffbe401ef870b956fc5cf3b6269aa7e56b266 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sat, 21 Jul 2018 16:55:04 -0400
|
||||
Subject: [PATCH] Async Chunk Loading and Generation
|
||||
|
@ -43,7 +43,7 @@ reading or writing to the chunk will be safe, so plugins still
|
|||
should not be touching chunks asynchronously!
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
index 359c538f32..942520088e 100644
|
||||
index 359c538f3..942520088 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
@@ -376,4 +376,57 @@ public class PaperConfig {
|
||||
|
@ -106,7 +106,7 @@ index 359c538f32..942520088e 100644
|
|||
}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java b/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java
|
||||
new file mode 100644
|
||||
index 0000000000..8f18c28695
|
||||
index 000000000..8f18c2869
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java
|
||||
@@ -0,0 +1,347 @@
|
||||
|
@ -458,7 +458,7 @@ index 0000000000..8f18c28695
|
|||
+
|
||||
+}
|
||||
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
||||
index 71d865b76a..6d3f5b6512 100644
|
||||
index 71d865b76..6d3f5b651 100644
|
||||
--- a/src/main/java/net/minecraft/server/Chunk.java
|
||||
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
||||
@@ -190,6 +190,7 @@ public class Chunk implements IChunkAccess {
|
||||
|
@ -470,7 +470,7 @@ index 71d865b76a..6d3f5b6512 100644
|
|||
|
||||
Iterator iterator = protochunk.s().iterator();
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
|
||||
index 2021c0d02e..154ab09e0c 100644
|
||||
index 2021c0d02..154ab09e0 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkMap.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkMap.java
|
||||
@@ -14,9 +14,17 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
|
||||
|
@ -562,7 +562,7 @@ index 2021c0d02e..154ab09e0c 100644
|
|||
|
||||
public void putAll(Map<? extends Long, ? extends Chunk> map) {
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
index 186cfda7e4..9cdeb3bfc2 100644
|
||||
index 186cfda7e..9cdeb3bfc 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
@@ -33,12 +33,12 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
|
@ -712,7 +712,7 @@ index 186cfda7e4..9cdeb3bfc2 100644
|
|||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||
index d938eb3749..51df075b44 100644
|
||||
index d938eb374..51df075b4 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||
@@ -119,7 +119,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
|
||||
|
@ -739,7 +739,7 @@ index d938eb3749..51df075b44 100644
|
|||
completion = new Supplier<NBTTagCompound>() {
|
||||
public NBTTagCompound get() {
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
|
||||
index 2af07ae592..9c6844d441 100644
|
||||
index 2af07ae59..9c6844d44 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkSection.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkSection.java
|
||||
@@ -25,7 +25,17 @@ public class ChunkSection {
|
||||
|
@ -761,7 +761,7 @@ index 2af07ae592..9c6844d441 100644
|
|||
public IBlockData getType(int i, int j, int k) {
|
||||
return (IBlockData) this.blockIds.a(i, j, k);
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
|
||||
index d3898599f8..8f061f5ca3 100644
|
||||
index d3898599f..8f061f5ca 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
|
||||
@@ -17,13 +17,14 @@ public class ChunkTaskScheduler extends Scheduler<ChunkCoordIntPair, ChunkStatus
|
||||
|
@ -832,7 +832,7 @@ index d3898599f8..8f061f5ca3 100644
|
|||
|
||||
protected ProtoChunk a(ChunkCoordIntPair chunkcoordintpair, ChunkStatus chunkstatus, Map<ChunkCoordIntPair, ProtoChunk> map) {
|
||||
diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
|
||||
index 454903a0e7..dcbcb655c5 100644
|
||||
index 454903a0e..dcbcb655c 100644
|
||||
--- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
|
||||
+++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
|
||||
@@ -3,7 +3,7 @@ package net.minecraft.server;
|
||||
|
@ -920,7 +920,7 @@ index 454903a0e7..dcbcb655c5 100644
|
|||
|
||||
// Paper start - Anti-Xray - Support default methods
|
||||
diff --git a/src/main/java/net/minecraft/server/DefinedStructureManager.java b/src/main/java/net/minecraft/server/DefinedStructureManager.java
|
||||
index f5a6387f27..f456850997 100644
|
||||
index f5a6387f2..f45685099 100644
|
||||
--- a/src/main/java/net/minecraft/server/DefinedStructureManager.java
|
||||
+++ b/src/main/java/net/minecraft/server/DefinedStructureManager.java
|
||||
@@ -21,7 +21,7 @@ import org.apache.logging.log4j.Logger;
|
||||
|
@ -933,7 +933,7 @@ index f5a6387f27..f456850997 100644
|
|||
private final MinecraftServer d;
|
||||
private final java.nio.file.Path e;
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index a4c5b0b5b5..b572e535ac 100644
|
||||
index a4c5b0b5b..b572e535a 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -207,7 +207,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
|
@ -946,7 +946,7 @@ index a4c5b0b5b5..b572e535ac 100644
|
|||
this.aJ = Sets.newHashSet();
|
||||
this.aL = new double[] { 0.0D, 0.0D, 0.0D};
|
||||
diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java
|
||||
index 4698ee99f8..dfb45cc4ea 100644
|
||||
index 4698ee99f..dfb45cc4e 100644
|
||||
--- a/src/main/java/net/minecraft/server/IChunkLoader.java
|
||||
+++ b/src/main/java/net/minecraft/server/IChunkLoader.java
|
||||
@@ -6,6 +6,8 @@ import javax.annotation.Nullable;
|
||||
|
@ -959,7 +959,7 @@ index 4698ee99f8..dfb45cc4ea 100644
|
|||
Chunk a(GeneratorAccess generatoraccess, int i, int j, Consumer<Chunk> consumer) throws IOException;
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/MathHelper.java b/src/main/java/net/minecraft/server/MathHelper.java
|
||||
index 8bb2593aa9..67bb289545 100644
|
||||
index 8bb2593aa..67bb28954 100644
|
||||
--- a/src/main/java/net/minecraft/server/MathHelper.java
|
||||
+++ b/src/main/java/net/minecraft/server/MathHelper.java
|
||||
@@ -7,7 +7,7 @@ import java.util.function.IntPredicate;
|
||||
|
@ -980,7 +980,7 @@ index 8bb2593aa9..67bb289545 100644
|
|||
f %= 360.0F;
|
||||
if (f >= 180.0F) {
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index 68743a6b77..1dbb03a9a0 100644
|
||||
index 68743a6b7..1dbb03a9a 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -499,6 +499,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
|
||||
|
@ -1070,7 +1070,7 @@ index 68743a6b77..1dbb03a9a0 100644
|
|||
if (true || worldserver.worldProvider.getDimensionManager() == DimensionManager.OVERWORLD || this.getAllowNether()) { // CraftBukkit
|
||||
diff --git a/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java b/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java
|
||||
new file mode 100644
|
||||
index 0000000000..e9a38f9d90
|
||||
index 000000000..e9a38f9d9
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java
|
||||
@@ -0,0 +1,655 @@
|
||||
|
@ -1730,7 +1730,7 @@ index 0000000000..e9a38f9d90
|
|||
+
|
||||
+}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
|
||||
index 240f590666..e4cf8548d3 100644
|
||||
index 240f59066..e4cf8548d 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerChunk.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerChunk.java
|
||||
@@ -22,6 +22,52 @@ public class PlayerChunk {
|
||||
|
@ -1828,7 +1828,7 @@ index 240f590666..e4cf8548d3 100644
|
|||
}
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
index 679488a3cf..b7dda8e282 100644
|
||||
index 679488a3c..b7dda8e28 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
@@ -25,10 +25,10 @@ public class PlayerChunkMap {
|
||||
|
@ -1888,7 +1888,7 @@ index 679488a3cf..b7dda8e282 100644
|
|||
|
||||
private void e() {
|
||||
diff --git a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
|
||||
index de6dd4fed7..da6df06d84 100644
|
||||
index de6dd4fed..da6df06d8 100644
|
||||
--- a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
|
||||
+++ b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
|
||||
@@ -34,7 +34,7 @@ public class RegionLimitedWorldAccess implements GeneratorAccess {
|
||||
|
@ -1901,7 +1901,7 @@ index de6dd4fed7..da6df06d84 100644
|
|||
this.m = world.getChunkProvider().getChunkGenerator().getSettings();
|
||||
this.i = world.getSeaLevel();
|
||||
diff --git a/src/main/java/net/minecraft/server/SchedulerBatch.java b/src/main/java/net/minecraft/server/SchedulerBatch.java
|
||||
index 8e909d9caf..f214a74a29 100644
|
||||
index 8e909d9ca..f214a74a2 100644
|
||||
--- a/src/main/java/net/minecraft/server/SchedulerBatch.java
|
||||
+++ b/src/main/java/net/minecraft/server/SchedulerBatch.java
|
||||
@@ -10,6 +10,7 @@ public class SchedulerBatch<K, T extends SchedulerTask<K, T>, R> {
|
||||
|
@ -1956,7 +1956,7 @@ index 8e909d9caf..f214a74a29 100644
|
|||
}
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/StructurePiece.java b/src/main/java/net/minecraft/server/StructurePiece.java
|
||||
index d9def71353..945a005e90 100644
|
||||
index d9def7135..945a005e9 100644
|
||||
--- a/src/main/java/net/minecraft/server/StructurePiece.java
|
||||
+++ b/src/main/java/net/minecraft/server/StructurePiece.java
|
||||
@@ -16,7 +16,7 @@ public abstract class StructurePiece {
|
||||
|
@ -1991,7 +1991,7 @@ index d9def71353..945a005e90 100644
|
|||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/StructureStart.java b/src/main/java/net/minecraft/server/StructureStart.java
|
||||
index 284e96710a..8b08efe1f4 100644
|
||||
index 284e96710..8b08efe1f 100644
|
||||
--- a/src/main/java/net/minecraft/server/StructureStart.java
|
||||
+++ b/src/main/java/net/minecraft/server/StructureStart.java
|
||||
@@ -7,7 +7,7 @@ import java.util.Random;
|
||||
|
@ -2052,7 +2052,7 @@ index 284e96710a..8b08efe1f4 100644
|
|||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index f48d5d9f78..b5b0fcf8cd 100644
|
||||
index f48d5d9f7..b5b0fcf8c 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -41,7 +41,7 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
|
||||
|
@ -2149,7 +2149,7 @@ index f48d5d9f78..b5b0fcf8cd 100644
|
|||
if (entity.valid) { MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable()); return true; } // Paper
|
||||
if (!CraftEventFactory.doEntityAddEventCalling(this, entity, spawnReason)) {
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java
|
||||
index 69d8a25bdf..d0eaa9e9f8 100644
|
||||
index 69d8a25bd..d0eaa9e9f 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldGenStronghold.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java
|
||||
@@ -10,23 +10,28 @@ import javax.annotation.Nullable;
|
||||
|
@ -2302,7 +2302,7 @@ index 69d8a25bdf..d0eaa9e9f8 100644
|
|||
}
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index a9fffa544f..19ce77c4a3 100644
|
||||
index a9fffa544..19ce77c4a 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -715,7 +715,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
|
||||
|
@ -2315,10 +2315,10 @@ index a9fffa544f..19ce77c4a3 100644
|
|||
}
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 4dabd31d96..007cc64387 100644
|
||||
index 5fca9e4bd..78adc8714 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1019,8 +1019,12 @@ public final class CraftServer implements Server {
|
||||
@@ -1021,8 +1021,12 @@ public final class CraftServer implements Server {
|
||||
if (internal.getWorld().getKeepSpawnInMemory()) {
|
||||
short short1 = internal.paperConfig.keepLoadedRange; // Paper
|
||||
long i = System.currentTimeMillis();
|
||||
|
@ -2333,7 +2333,7 @@ index 4dabd31d96..007cc64387 100644
|
|||
long l = System.currentTimeMillis();
|
||||
|
||||
if (l < i) {
|
||||
@@ -1036,7 +1040,7 @@ public final class CraftServer implements Server {
|
||||
@@ -1038,7 +1042,7 @@ public final class CraftServer implements Server {
|
||||
}
|
||||
|
||||
BlockPosition chunkcoordinates = internal.getSpawn();
|
||||
|
@ -2343,7 +2343,7 @@ index 4dabd31d96..007cc64387 100644
|
|||
}
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
index 95fe3a91bf..b5a87cfaf6 100644
|
||||
index 95fe3a91b..b5a87cfaf 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -163,6 +163,16 @@ public class CraftWorld implements World {
|
||||
|
@ -2381,7 +2381,7 @@ index 95fe3a91bf..b5a87cfaf6 100644
|
|||
if (isChunkLoaded(chunkCoordX + x, chunkCoordZ + z)) {
|
||||
unloadChunk(chunkCoordX + x, chunkCoordZ + z);
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
index 054ebc82bd..2e0b4de83b 100644
|
||||
index 054ebc82b..2e0b4de83 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
@@ -82,6 +82,7 @@ public class CraftEventFactory {
|
||||
|
@ -2443,7 +2443,7 @@ index 054ebc82bd..2e0b4de83b 100644
|
|||
|
||||
if (!event.isCancelled()) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
|
||||
index 9c917370ae..a299092a58 100644
|
||||
index 9c917370a..a299092a5 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
|
||||
@@ -21,6 +21,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator<GeneratorSettin
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
From 17e3b11bf71f9b7a8c491d7d048cde92b25b6324 Mon Sep 17 00:00:00 2001
|
||||
From 967d384c71fbb73bfb5a500d9dccb24825dd478d Mon Sep 17 00:00:00 2001
|
||||
From: Shane Freeder <theboyetronic@gmail.com>
|
||||
Date: Sun, 18 Nov 2018 19:49:56 +0000
|
||||
Subject: [PATCH] Make the default permission message configurable
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
index 07f0b45295..a7673dd49d 100644
|
||||
index 07f0b4529..a7673dd49 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||||
@@ -21,6 +21,7 @@ import java.util.regex.Pattern;
|
||||
|
@ -29,10 +29,10 @@ index 07f0b45295..a7673dd49d 100644
|
|||
private static void savePlayerData() {
|
||||
savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 007cc64387..92c429dded 100644
|
||||
index 78adc8714..27fc7f9aa 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -2147,6 +2147,10 @@ public final class CraftServer implements Server {
|
||||
@@ -2168,6 +2168,10 @@ public final class CraftServer implements Server {
|
||||
return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
|
||||
}
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit d58803c2b640ab583f259a5c6a8b5d1919634ae3
|
||||
Subproject commit 3108e64a6ac9b00a74c94441ce0dc5d63ecd652a
|
|
@ -1 +1 @@
|
|||
Subproject commit ed274c517f57b2fa0d181d3c32c5b3544d67689d
|
||||
Subproject commit ad6070dffd9bd5e46bd9d9d423a6d111a8af130a
|
Loading…
Reference in a new issue