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

Updated Upstream (Bukkit/CraftBukkit/Spigot)

Browse Source 
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:
564ed152 #482: Add a DragonBattle API to manipulate respawn phases etc
9f2fd967 #474: Add ability to set other plugin names as provided API so others can still depend on it

CraftBukkit Changes:
fc318cc1 #642: Add a DragonBattle API to manipulate respawn phases etc
796eb15a #644: Fix ChunkMapDistance#removeAllTicketsFor not propagating ticket level updates
a6f80937 SPIGOT-5606: call BlockRedstoneEvent for fence gates

Spigot Changes:
a03b1fdb Rebuild patches
This commit is contained in:
Shane Freeder 2020-03-26 02:37:20 +00:00
parent 68ec946c7a
commit 9a7ca3dbc5
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
44 changed files with 281 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
Spigot-API-Patches/0004-Timings-v2.patch
View File

@ -1,4 +1,4 @@
From feeed52905ed00fbf0ee435848cb45c003b61aaf Mon Sep 17 00:00:00 2001
From 954f387075f7d94134b6b65ebce3183d4dbd2b1d 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 000000000..64531fcce
index 00000000..64531fcc
--- /dev/null
+++ b/src/main/java/co/aikar/timings/FullServerTickHandler.java
@@ -0,0 +1,84 @@
@ -96,7 +96,7 @@ index 000000000..64531fcce
+}
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 000000000..9b45ce887
index 00000000..9b45ce88
--- /dev/null
+++ b/src/main/java/co/aikar/timings/NullTimingHandler.java
@@ -0,0 +1,68 @@
@ -170,7 +170,7 @@ index 000000000..9b45ce887
+}
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 000000000..933ecf9bd
index 00000000..933ecf9b
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java
@@ -0,0 +1,83 @@
@ -259,7 +259,7 @@ index 000000000..933ecf9bd
+}
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 000000000..a21e5ead5
index 00000000..a21e5ead
--- /dev/null
+++ b/src/main/java/co/aikar/timings/Timing.java
@@ -0,0 +1,83 @@
@ -348,7 +348,7 @@ index 000000000..a21e5ead5
+}
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 000000000..a5d13a1e4
index 00000000..a5d13a1e
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingData.java
@@ -0,0 +1,122 @@
@ -476,7 +476,7 @@ index 000000000..a5d13a1e4
+}
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 000000000..cc0390c06
index 00000000..cc0390c0
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingHandler.java
@@ -0,0 +1,227 @@
@ -709,7 +709,7 @@ index 000000000..cc0390c06
+}
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 000000000..ddaed8127
index 00000000..ddaed812
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingHistory.java
@@ -0,0 +1,354 @@
@ -1069,7 +1069,7 @@ index 000000000..ddaed8127
+}
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 000000000..86d5ac6bd
index 00000000..86d5ac6b
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingHistoryEntry.java
@@ -0,0 +1,58 @@
@ -1133,7 +1133,7 @@ index 000000000..86d5ac6bd
+}
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 000000000..df142a89b
index 00000000..df142a89
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingIdentifier.java
@@ -0,0 +1,116 @@
@ -1255,7 +1255,7 @@ index 000000000..df142a89b
+}
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 000000000..0b34e0d01
index 00000000..0b34e0d0
--- /dev/null
+++ b/src/main/java/co/aikar/timings/Timings.java
@@ -0,0 +1,293 @@
@ -1554,7 +1554,7 @@ index 000000000..0b34e0d01
+}
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 000000000..c0d8f2016
index 00000000..c0d8f201
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingsCommand.java
@@ -0,0 +1,122 @@
@ -1682,7 +1682,7 @@ index 000000000..c0d8f2016
+}
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 000000000..93d5a3f97
index 00000000..93d5a3f9
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -0,0 +1,355 @@
@ -2043,7 +2043,7 @@ index 000000000..93d5a3f97
+}
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 000000000..ef824d701
index 00000000..ef824d70
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingsManager.java
@@ -0,0 +1,188 @@
@ -2237,7 +2237,7 @@ index 000000000..ef824d701
+}
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 000000000..bf3e059fe
index 00000000..bf3e059f
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingsReportListener.java
@@ -0,0 +1,75 @@
@ -2318,7 +2318,7 @@ index 000000000..bf3e059fe
+}
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 000000000..632c49615
index 00000000..632c4961
--- /dev/null
+++ b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
@@ -0,0 +1,53 @@
@ -2377,7 +2377,7 @@ index 000000000..632c49615
+}
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 000000000..80155072d
index 00000000..80155072
--- /dev/null
+++ b/src/main/java/co/aikar/util/Counter.java
@@ -0,0 +1,38 @@
@ -2421,7 +2421,7 @@ index 000000000..80155072d
+}
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 000000000..190bf0598
index 00000000..190bf059
--- /dev/null
+++ b/src/main/java/co/aikar/util/JSONUtil.java
@@ -0,0 +1,140 @@
@ -2567,7 +2567,7 @@ index 000000000..190bf0598
+}
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 000000000..63a899c7d
index 00000000..63a899c7
--- /dev/null
+++ b/src/main/java/co/aikar/util/LoadingIntMap.java
@@ -0,0 +1,76 @@
@ -2649,7 +2649,7 @@ index 000000000..63a899c7d
+}
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 000000000..aedbb0332
index 00000000..aedbb033
--- /dev/null
+++ b/src/main/java/co/aikar/util/LoadingMap.java
@@ -0,0 +1,368 @@
@ -3023,7 +3023,7 @@ index 000000000..aedbb0332
+}
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 000000000..5989ee212
index 00000000..5989ee21
--- /dev/null
+++ b/src/main/java/co/aikar/util/MRUMapCache.java
@@ -0,0 +1,111 @@
@ -3139,7 +3139,7 @@ index 000000000..5989ee212
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index ae21e0f97..755869366 100644
index ae21e0f9..75586936 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -618,7 +618,6 @@ public final class Bukkit {
@ -3151,7 +3151,7 @@ index ae21e0f97..755869366 100644
/**
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index f6fb72fab..fad4e9292 100644
index f6fb72fa..fad4e929 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1300,6 +1300,26 @@ public interface Server extends PluginMessageRecipient {
@ -3182,7 +3182,7 @@ index f6fb72fab..fad4e9292 100644
* Sends the component to the player
*
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
index 247d194f8..72c5501e8 100644
index 247d194f..72c5501e 100644
--- a/src/main/java/org/bukkit/UnsafeValues.java
+++ b/src/main/java/org/bukkit/UnsafeValues.java
@@ -69,4 +69,12 @@ public interface UnsafeValues {
@ -3200,7 +3200,7 @@ index 247d194f8..72c5501e8 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 000000000..f9a00aecc
index 00000000..f9a00aec
--- /dev/null
+++ b/src/main/java/org/bukkit/command/BufferedCommandSender.java
@@ -0,0 +1,21 @@
@ -3226,7 +3226,7 @@ index 000000000..f9a00aecc
+ }
+}
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
index 4bfc21468..03bdc1622 100644
index 4bfc2146..03bdc162 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 {
@ -3256,7 +3256,7 @@ index 4bfc21468..03bdc1622 100644
return true;
}
diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
index d6c8938b1..a6ad94ef9 100644
index d6c8938b..a6ad94ef 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 {
@ -3280,7 +3280,7 @@ index d6c8938b1..a6ad94ef9 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 000000000..ca1893e9f
index 00000000..ca1893e9
--- /dev/null
+++ b/src/main/java/org/bukkit/command/MessageCommandSender.java
@@ -0,0 +1,114 @@
@ -3399,7 +3399,7 @@ index 000000000..ca1893e9f
+
+}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index 81e4fa573..f020cb04e 100644
index 81e4fa57..f020cb04 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -15,7 +15,6 @@ import org.bukkit.command.defaults.BukkitCommand;
@ -3456,7 +3456,7 @@ index 81e4fa573..f020cb04e 100644
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 2a145d851..000000000
index 2a145d85..00000000
--- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
+++ /dev/null
@@ -1,250 +0,0 @@
@ -3711,7 +3711,7 @@ index 2a145d851..000000000
- // Spigot end
-}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 9b0153f7d..9d82a691a 100644
index 9b0153f7..9d82a691 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1573,6 +1573,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@ -3727,10 +3727,10 @@ index 9b0153f7d..9d82a691a 100644
@NotNull
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 180794eb4..b9ce12ff9 100644
index ec77d7be..c548911c 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -313,7 +313,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -358,7 +358,6 @@ public final class SimplePluginManager implements PluginManager {
}
}
@ -3738,16 +3738,19 @@ index 180794eb4..b9ce12ff9 100644
return result.toArray(new Plugin[result.size()]);
}
@@ -352,7 +351,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -397,9 +396,9 @@ public final class SimplePluginManager implements PluginManager {
if (result != null) {
plugins.add(result);
- lookupNames.put(result.getDescription().getName(), result);
+ lookupNames.put(result.getDescription().getName().toLowerCase(java.util.Locale.ENGLISH), result); // Paper
for (String provided : result.getDescription().getProvides()) {
- lookupNames.putIfAbsent(provided, result);
+ lookupNames.putIfAbsent(provided.toLowerCase(java.util.Locale.ENGLISH), result); // Paper
}
}
return result;
@@ -380,7 +379,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -428,7 +427,7 @@ public final class SimplePluginManager implements PluginManager {
@Override
@Nullable
public synchronized Plugin getPlugin(@NotNull String name) {
@ -3756,7 +3759,7 @@ index 180794eb4..b9ce12ff9 100644
}
@Override
@@ -598,7 +597,8 @@ public final class SimplePluginManager implements PluginManager {
@@ -646,7 +645,8 @@ public final class SimplePluginManager implements PluginManager {
throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
}
@ -3766,7 +3769,7 @@ index 180794eb4..b9ce12ff9 100644
getEventListeners(event).register(new TimedRegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
} else {
getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
@@ -802,7 +802,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -860,7 +860,7 @@ public final class SimplePluginManager implements PluginManager {
@Override
public boolean useTimings() {
@ -3775,7 +3778,7 @@ index 180794eb4..b9ce12ff9 100644
}
/**
@@ -811,6 +811,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -869,6 +869,6 @@ public final class SimplePluginManager implements PluginManager {
* @param use True if per event timing code should be used
*/
public void useTimings(boolean use) {
@ -3784,7 +3787,7 @@ index 180794eb4..b9ce12ff9 100644
}
}
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index df8a5dcbe..50a51394f 100644
index df8a5dcb..50a51394 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -53,7 +53,6 @@ public final class JavaPluginLoader implements PluginLoader {
@ -3827,7 +3830,7 @@ index df8a5dcbe..50a51394f 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 5830e8b9b..36f542a85 100644
index 5830e8b9..36f542a8 100644
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -28,7 +28,8 @@ import org.jetbrains.annotations.Nullable;
@ -3841,7 +3844,7 @@ index 5830e8b9b..36f542a85 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 5ca863b36..612958a33 100644
index 5ca863b3..612958a3 100644
--- a/src/main/java/org/bukkit/util/CachedServerIcon.java
+++ b/src/main/java/org/bukkit/util/CachedServerIcon.java
@@ -2,6 +2,7 @@ package org.bukkit.util;
@ -3864,7 +3867,7 @@ index 5ca863b36..612958a33 100644
+
+}
diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java
index 44badfedc..3cbe5c2bb 100644
index 44badfed..3cbe5c2b 100644
--- a/src/main/java/org/spigotmc/CustomTimingsHandler.java
+++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java
@@ -1,3 +1,26 @@
@ -4088,5 +4091,5 @@ index 44badfedc..3cbe5c2bb 100644
+
}
--
2.25.0
2.26.0

36
Spigot-API-Patches/0017-Add-exception-reporting-event.patch
View File

@ -1,4 +1,4 @@
From 7a83523a3eebae620b149e5ef57205a59c5acd97 Mon Sep 17 00:00:00 2001
From d828cc996beb79f80dc5fff118416fe7d87ee90a Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 20:24:35 -0600
Subject: [PATCH] Add exception reporting event
@ -6,7 +6,7 @@ Subject: [PATCH] Add exception reporting event
diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java
new file mode 100644
index 000000000..2f573299a
index 00000000..2f573299
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java
@@ -0,0 +1,43 @@
@ -55,7 +55,7 @@ index 000000000..2f573299a
+}
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java
new file mode 100644
index 000000000..6fb39af04
index 00000000..6fb39af0
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java
@@ -0,0 +1,64 @@
@ -125,7 +125,7 @@ index 000000000..6fb39af04
+}
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java
new file mode 100644
index 000000000..410b24139
index 00000000..410b2413
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java
@@ -0,0 +1,52 @@
@ -183,7 +183,7 @@ index 000000000..410b24139
+}
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerException.java
new file mode 100644
index 000000000..c06ea3942
index 00000000..c06ea394
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerException.java
@@ -0,0 +1,23 @@
@ -212,7 +212,7 @@ index 000000000..c06ea3942
+}
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java
new file mode 100644
index 000000000..e762ed0db
index 00000000..e762ed0d
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java
@@ -0,0 +1,35 @@
@ -253,7 +253,7 @@ index 000000000..e762ed0db
+}
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java
new file mode 100644
index 000000000..f016ba3b1
index 00000000..f016ba3b
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java
@@ -0,0 +1,20 @@
@ -280,7 +280,7 @@ index 000000000..f016ba3b1
\ No newline at end of file
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java
new file mode 100644
index 000000000..6defac287
index 00000000..6defac28
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java
@@ -0,0 +1,38 @@
@ -324,7 +324,7 @@ index 000000000..6defac287
+}
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java
new file mode 100644
index 000000000..89e132525
index 00000000..89e13252
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java
@@ -0,0 +1,64 @@
@ -394,7 +394,7 @@ index 000000000..89e132525
+}
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java
new file mode 100644
index 000000000..2d0b2d4a9
index 00000000..2d0b2d4a
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java
@@ -0,0 +1,37 @@
@ -437,7 +437,7 @@ index 000000000..2d0b2d4a9
+}
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java
new file mode 100644
index 000000000..5582999fe
index 00000000..5582999f
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java
@@ -0,0 +1,22 @@
@ -464,7 +464,7 @@ index 000000000..5582999fe
+ }
+}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index f020cb04e..adfc7aae2 100644
index f020cb04..adfc7aae 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -8,6 +8,10 @@ import java.util.HashMap;
@ -506,7 +506,7 @@ index f020cb04e..adfc7aae2 100644
}
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index b9ce12ff9..715954c75 100644
index c548911c..9a5fe8ca 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -23,6 +23,10 @@ import java.util.WeakHashMap;
@ -520,7 +520,7 @@ index b9ce12ff9..715954c75 100644
import org.apache.commons.lang.Validate;
import org.bukkit.Server;
import org.bukkit.World;
@@ -430,7 +434,8 @@ public final class SimplePluginManager implements PluginManager {
@@ -478,7 +482,8 @@ public final class SimplePluginManager implements PluginManager {
try {
plugin.getPluginLoader().enablePlugin(plugin);
} catch (Throwable ex) {
@ -530,7 +530,7 @@ index b9ce12ff9..715954c75 100644
}
HandlerList.bakeAll();
@@ -451,32 +456,37 @@ public final class SimplePluginManager implements PluginManager {
@@ -499,32 +504,37 @@ public final class SimplePluginManager implements PluginManager {
try {
plugin.getPluginLoader().disablePlugin(plugin);
} catch (Throwable ex) {
@ -573,7 +573,7 @@ index b9ce12ff9..715954c75 100644
}
try {
@@ -489,6 +499,13 @@ public final class SimplePluginManager implements PluginManager {
@@ -537,6 +547,13 @@ public final class SimplePluginManager implements PluginManager {
}
}
@ -587,7 +587,7 @@ index b9ce12ff9..715954c75 100644
@Override
public void clearPlugins() {
synchronized (this) {
@@ -552,7 +569,13 @@ public final class SimplePluginManager implements PluginManager {
@@ -600,7 +617,13 @@ public final class SimplePluginManager implements PluginManager {
));
}
} catch (Throwable ex) {
@ -603,5 +603,5 @@ index b9ce12ff9..715954c75 100644
}
}
--
2.25.0
2.26.0

14
Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch
View File

@ -1,4 +1,4 @@
From ae45a92f46cd6e9b264fe7853162bfeb87a112e3 Mon Sep 17 00:00:00 2001
From f00c5126e2cc85c6f326663998ffe6c310531c1f 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,7 +6,7 @@ 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 39423f3a6..423fecf54 100644
index 39423f3a..423fecf5 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1574,6 +1574,13 @@ public final class Bukkit {
@ -24,7 +24,7 @@ index 39423f3a6..423fecf54 100644
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index b09d01085..38d7da737 100644
index b09d0108..38d7da73 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1388,4 +1388,6 @@ public interface Server extends PluginMessageRecipient {
@ -35,7 +35,7 @@ index b09d01085..38d7da737 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 50cc311be..c62da4131 100644
index 50cc311b..c62da413 100644
--- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
@@ -13,15 +13,35 @@ public class ReloadCommand extends BukkitCommand {
@ -85,10 +85,10 @@ index 50cc311be..c62da4131 100644
}
}
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 715954c75..f70296d76 100644
index 9a5fe8ca..8ddaf9c2 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -836,4 +836,13 @@ public final class SimplePluginManager implements PluginManager {
@@ -894,4 +894,13 @@ public final class SimplePluginManager implements PluginManager {
public void useTimings(boolean use) {
co.aikar.timings.Timings.setTimingsEnabled(use); // Paper
}
@ -103,5 +103,5 @@ index 715954c75..f70296d76 100644
+
}
--
2.25.0
2.26.0

8
Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch
View File

@ -1,4 +1,4 @@
From 94279e0d80150a70cdd70a23eb90b736f4980703 Mon Sep 17 00:00:00 2001
From fe0318389beb2088daeccc0b47ab87418d56bdec Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 7 Jan 2017 15:23:03 -0500
Subject: [PATCH] Provide E/TE/Chunk count stat methods
@ -7,10 +7,10 @@ Provides counts without the ineffeciency of using .getEntities().size()
which creates copy of the collections.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 4cbf6101..edd73f41 100644
index cd8a0957..808c3b4a 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -39,6 +39,33 @@ import org.jetbrains.annotations.Nullable;
@@ -40,6 +40,33 @@ import org.jetbrains.annotations.Nullable;
*/
public interface World extends PluginMessageRecipient, Metadatable {
@ -45,5 +45,5 @@ index 4cbf6101..edd73f41 100644
* Gets the {@link Block} at the given coordinates
*
--
2.25.0.windows.1
2.26.0

28
Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch
View File

@ -1,4 +1,4 @@
From abe7f7270eb38d816f1093e87ba77028afe49098 Mon Sep 17 00:00:00 2001
From 6f09bf71699cd554a8891cb9f0d72f4a290dcc9f Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 10 Jun 2017 16:59:40 -0500
Subject: [PATCH] Fix upstream javadoc warnings and errors
@ -6,10 +6,10 @@ Subject: [PATCH] Fix upstream javadoc warnings and errors
Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index e2f0dc77e..bc1b8f120 100644
index 808c3b4a..3b027f67 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2008,6 +2008,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -2009,6 +2009,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param count the number of particles
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
@ -17,7 +17,7 @@ index e2f0dc77e..bc1b8f120 100644
*/
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, @Nullable T data);
@@ -2024,6 +2025,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -2025,6 +2026,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param count the number of particles
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
@ -25,7 +25,7 @@ index e2f0dc77e..bc1b8f120 100644
*/
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, @Nullable T data);
@@ -2074,6 +2076,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -2075,6 +2077,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param offsetZ the maximum random offset on the Z axis
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
@ -33,7 +33,7 @@ index e2f0dc77e..bc1b8f120 100644
*/
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
@@ -2094,6 +2097,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -2095,6 +2098,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param offsetZ the maximum random offset on the Z axis
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
@ -41,7 +41,7 @@ index e2f0dc77e..bc1b8f120 100644
*/
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
@@ -2150,6 +2154,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -2151,6 +2155,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* particle used (normally speed)
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
@ -49,7 +49,7 @@ index e2f0dc77e..bc1b8f120 100644
*/
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
@@ -2172,6 +2177,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -2173,6 +2178,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* particle used (normally speed)
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
@ -57,7 +57,7 @@ index e2f0dc77e..bc1b8f120 100644
*/
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
@@ -2195,6 +2201,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -2196,6 +2202,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param force whether to send the particle to players within an extended
* range and encourage their client to render it regardless of
* settings
@ -65,7 +65,7 @@ index e2f0dc77e..bc1b8f120 100644
*/
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force);
@@ -2220,6 +2227,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -2221,6 +2228,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param force whether to send the particle to players within an extended
* range and encourage their client to render it regardless of
* settings
@ -74,7 +74,7 @@ index e2f0dc77e..bc1b8f120 100644
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force);
diff --git a/src/main/java/org/bukkit/entity/AreaEffectCloud.java b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
index c2096b534..bca9d3659 100644
index c2096b53..bca9d365 100644
--- a/src/main/java/org/bukkit/entity/AreaEffectCloud.java
+++ b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
@@ -142,6 +142,7 @@ public interface AreaEffectCloud extends Entity {
@ -86,7 +86,7 @@ index c2096b534..bca9d3659 100644
<T> void setParticle(@NotNull Particle particle, @Nullable T data);
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 58a6795df..f10ef7ae7 100644
index 58a6795d..f10ef7ae 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -459,7 +459,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@ -179,7 +179,7 @@ index 58a6795df..f10ef7ae7 100644
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
diff --git a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
index 1b2267f4e..1a58734d9 100644
index 1b2267f4..1a58734d 100644
--- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
@@ -78,7 +78,7 @@ public class PlayerMoveEvent extends PlayerEvent implements Cancellable {
@ -192,5 +192,5 @@ index 1b2267f4e..1a58734d9 100644
return to;
}
--
2.25.0
2.26.0

27
Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch
View File

@ -1,11 +1,11 @@
From e955f61d6121d9145086bb3aefcd07f8d19a6505 Mon Sep 17 00:00:00 2001
From eab6fa45fa7d9eddd35d65024ec8e8b2e89d3088 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Mon, 31 Jul 2017 02:08:55 -0500
Subject: [PATCH] Make /plugins list alphabetical
diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
index 11fbd0e0..d4e74d29 100644
index bcb576a4..a1071e31 100644
--- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
@@ -3,6 +3,9 @@ package org.bukkit.command.defaults;
@ -18,31 +18,38 @@ index 11fbd0e0..d4e74d29 100644
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
@@ -34,19 +37,24 @@ public class PluginsCommand extends BukkitCommand {
@@ -34,23 +37,32 @@ public class PluginsCommand extends BukkitCommand {
@NotNull
private String getPluginList() {
- StringBuilder pluginList = new StringBuilder();
- Plugin[] plugins = Bukkit.getPluginManager().getPlugins();
+ // Paper start
+ TreeMap<String, ChatColor> plugins = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+ TreeMap<String, Plugin> plugins = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+
+ for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
+ plugins.put(plugin.getDescription().getName(), plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED);
+ plugins.put(plugin.getDescription().getName(), plugin);
+ }
- for (Plugin plugin : plugins) {
+ StringBuilder pluginList = new StringBuilder();
+ for (Map.Entry<String, ChatColor> entry : plugins.entrySet()) {
+ for (Map.Entry<String, Plugin> entry : plugins.entrySet()) {
if (pluginList.length() > 0) {
pluginList.append(ChatColor.WHITE);
pluginList.append(", ");
}
-
- pluginList.append(plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED);
- pluginList.append(plugin.getDescription().getName());
+ pluginList.append(entry.getValue());
+ pluginList.append(entry.getKey());
+ Plugin plugin = entry.getValue();
if (plugin.getDescription().getProvides().size() > 0) {
pluginList.append(" (").append(String.join(", ", plugin.getDescription().getProvides())).append(")");
}
+
+
+ pluginList.append(plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED);
+ pluginList.append(plugin.getDescription().getName());
}
- return "(" + plugins.length + "): " + pluginList.toString();
@ -51,5 +58,5 @@ index 11fbd0e0..d4e74d29 100644
}
}
--
2.25.0.windows.1
2.26.0

8
Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch
View File

@ -1,4 +1,4 @@
From 256e2482d181da8a5050ddf7145d181663db2639 Mon Sep 17 00:00:00 2001
From bbc895e361521f3a33a517aa5b067dc3ccb003ad Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 30 Apr 2018 17:55:28 -0400
Subject: [PATCH] Additional world.getNearbyEntities API's
@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's
Provides more methods to get nearby entities, and filter by types and predicates
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index da9f234d..ab2ddc05 100644
index 3b027f67..fbe7e76c 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1,6 +1,9 @@
@ -19,7 +19,7 @@ index da9f234d..ab2ddc05 100644
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
@@ -634,6 +637,256 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -635,6 +638,256 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull
public Collection<Entity> getEntitiesByClasses(@NotNull Class<?>... classes);
@ -291,5 +291,5 @@ index 6c09ea6c..76c4a1a6 100644
*/
public void setPlayerProfile(@NotNull PlayerProfile profile) {
--
2.25.0
2.26.0

12
Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch
View File

@ -1,4 +1,4 @@
From e08846314e171a7110f2be9645ea6f132e2c23e9 Mon Sep 17 00:00:00 2001
From 14230ba76aa0ced5ca25e493c15944568ca03365 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 29 Aug 2017 23:58:48 -0400
Subject: [PATCH] Expand World.spawnParticle API and add Builder
@ -10,7 +10,7 @@ This adds a new Builder API which is much friendlier to use.
diff --git a/src/main/java/com/destroystokyo/paper/ParticleBuilder.java b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
new file mode 100644
index 000000000..06f1602f5
index 00000000..06f1602f
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
@@ -0,0 +1,478 @@
@ -493,7 +493,7 @@ index 000000000..06f1602f5
+ }
+}
diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
index 49467ac70..d2ceb07c7 100644
index 49467ac7..d2ceb07c 100644
--- a/src/main/java/org/bukkit/Particle.java
+++ b/src/main/java/org/bukkit/Particle.java
@@ -96,6 +96,17 @@ public enum Particle {
@ -515,10 +515,10 @@ index 49467ac70..d2ceb07c7 100644
* Options which can be applied to redstone dust particles - a particle
* color and size.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 2dcab309f..b72f7b4b8 100644
index fbe7e76c..085c7a42 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2432,7 +2432,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -2433,7 +2433,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
* the type of this depends on {@link Particle#getDataType()}
* @param <T> Type
*/
@ -578,5 +578,5 @@ index 2dcab309f..b72f7b4b8 100644
/**
* Spawns the particle (the number of times specified by count)
--
2.25.0
2.26.0

10
Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch
View File

@ -1,4 +1,4 @@
From 9e0104613a45d118b2cfb5f2d3440b4767bc3f0f Mon Sep 17 00:00:00 2001
From 889d1e3dc852de32f8f2e72ffde3f5917fa7dd5c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 1 May 2018 21:33:35 -0400
Subject: [PATCH] Close Plugin Class Loaders on Disable
@ -53,10 +53,10 @@ index 41e26451..86cc5025 100644
* Gets a {@link Permission} from its fully qualified name
*
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 1c355a75..7453230c 100644
index 8ddaf9c2..8bb24f73 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -444,17 +444,28 @@ public final class SimplePluginManager implements PluginManager {
@@ -492,17 +492,28 @@ public final class SimplePluginManager implements PluginManager {
@Override
public void disablePlugins() {
@ -87,7 +87,7 @@ index 1c355a75..7453230c 100644
} catch (Throwable ex) {
handlePluginException("Error occurred (in the plugin loader) while disabling "
+ plugin.getDescription().getFullName() + " (Is it up to date?)", ex, plugin); // Paper
@@ -509,7 +520,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -557,7 +568,7 @@ public final class SimplePluginManager implements PluginManager {
@Override
public void clearPlugins() {
synchronized (this) {
@ -140,5 +140,5 @@ index e72cbde4..32ec68b4 100644
}
}
--
2.25.0
2.26.0

8
Spigot-API-Patches/0112-Expand-Explosions-API.patch
View File

@ -1,4 +1,4 @@
From 77d3bbb15dfa39739fa8a5712b848bd45fe042c6 Mon Sep 17 00:00:00 2001
From 20d2f3d94c812088dc301253d514cd1e2d4c198c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 19 Dec 2017 16:24:42 -0500
Subject: [PATCH] Expand Explosions API
@ -106,10 +106,10 @@ index 4cf22afc..ac3c8eef 100644
* Returns a list of entities within a bounding box centered around a Location.
*
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 54d86a76..86d488e5 100644
index 085c7a42..08985f77 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1353,6 +1353,88 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1354,6 +1354,88 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public boolean createExplosion(@NotNull Location loc, float power, boolean setFire);
@ -199,5 +199,5 @@ index 54d86a76..86d488e5 100644
* Creates explosion at given coordinates with given power and optionally
* setting blocks on fire or breaking blocks.
--
2.25.0
2.26.0

8
Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch
View File

@ -1,14 +1,14 @@
From ea50ead30623af4d40088561beb454adef129629 Mon Sep 17 00:00:00 2001
From 10bd6dc72fcfcb78a94312284433cacafafdf334 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Tue, 3 Jul 2018 16:07:16 +0200
Subject: [PATCH] Add World.getEntity(UUID) API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 86d488e5..f82063af 100644
index 08985f77..889756b1 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -913,6 +913,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -914,6 +914,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull
public Collection<Entity> getNearbyEntities(@NotNull Location location, double x, double y, double z);
@ -27,5 +27,5 @@ index 86d488e5..f82063af 100644
* Returns a list of entities within a bounding box centered around a
* Location.
--
2.25.0
2.26.0

19
Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch
View File

@ -1,4 +1,4 @@
From 877ce2e74abfa464cdf8952f5c8ec5dd18d779da Mon Sep 17 00:00:00 2001
From 07223946c9a87d22119a29d15f7295f6151d23cd Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 19 Jul 2018 22:07:02 +0200
Subject: [PATCH] Add an asterisk to legacy API plugins
@ -23,25 +23,24 @@ index c0ff133d..82106426 100644
// Paper end
}
diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
index d4e74d29..6cfd9f3c 100644
index a1071e31..3dcecf3a 100644
--- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java
@@ -41,7 +41,14 @@ public class PluginsCommand extends BukkitCommand {
TreeMap<String, ChatColor> plugins = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
@@ -59,7 +59,13 @@ public class PluginsCommand extends BukkitCommand {
for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
- plugins.put(plugin.getDescription().getName(), plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED);
pluginList.append(plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED);
- pluginList.append(plugin.getDescription().getName());
+ // Paper start - Add an asterisk to legacy plugins (so admins are aware)
+ String pluginName = plugin.getDescription().getName();
+ if (org.bukkit.UnsafeValues.isLegacyPlugin(plugin)) {
+ pluginName += "*";
+ }
+
+ plugins.put(pluginName, plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED);
+ pluginList.append(pluginName);
+ // Paper end
}
StringBuilder pluginList = new StringBuilder();
return "(" + plugins.size() + "): " + pluginList.toString();
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index 32ec68b4..8ff228ce 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@ -63,5 +62,5 @@ index 32ec68b4..8ff228ce 100644
JavaPlugin jPlugin = (JavaPlugin) plugin;
--
2.25.0
2.26.0

20
Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch
View File

@ -1,4 +1,4 @@
From 163117188ccb4f53aa7ca1e7f9bd8f771c765a88 Mon Sep 17 00:00:00 2001
From 179b574da237b5a3f750a5ee373405322c5385f2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 9 Sep 2018 00:32:05 -0400
Subject: [PATCH] Remove deadlock risk in firing async events
@ -16,7 +16,7 @@ which results in a hard crash.
This change removes the synchronize and adds some protection around enable/disable
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index a8dbf282d..b4069dbf3 100644
index a8dbf282..b4069dbf 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable;
@ -29,10 +29,10 @@ index a8dbf282d..b4069dbf3 100644
*
* @return a new copy of Location containing the position of this entity
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 93a8cc13b..8d54d5619 100644
index 8bb24f73..8355f9f0 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -414,7 +414,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -462,7 +462,7 @@ public final class SimplePluginManager implements PluginManager {
* @return true if the plugin is enabled, otherwise false
*/
@Override
@ -41,7 +41,7 @@ index 93a8cc13b..8d54d5619 100644
if ((plugin != null) && (plugins.contains(plugin))) {
return plugin.isEnabled();
} else {
@@ -423,7 +423,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -471,7 +471,7 @@ public final class SimplePluginManager implements PluginManager {
}
@Override
@ -50,7 +50,7 @@ index 93a8cc13b..8d54d5619 100644
if (!plugin.isEnabled()) {
List<Command> pluginCommands = PluginCommandYamlParser.parse(plugin);
@@ -461,7 +461,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -509,7 +509,7 @@ public final class SimplePluginManager implements PluginManager {
}
@Override
@ -59,7 +59,7 @@ index 93a8cc13b..8d54d5619 100644
// Paper end - close Classloader on disable
if (plugin.isEnabled()) {
try {
@@ -531,6 +531,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -579,6 +579,7 @@ public final class SimplePluginManager implements PluginManager {
defaultPerms.get(false).clear();
}
}
@ -67,7 +67,7 @@ index 93a8cc13b..8d54d5619 100644
/**
* Calls an event with the given details.
@@ -539,23 +540,13 @@ public final class SimplePluginManager implements PluginManager {
@@ -587,23 +588,13 @@ public final class SimplePluginManager implements PluginManager {
*/
@Override
public void callEvent(@NotNull Event event) {
@ -97,7 +97,7 @@ index 93a8cc13b..8d54d5619 100644
RegisteredListener[] listeners = handlers.getRegisteredListeners();
diff --git a/src/test/java/org/bukkit/plugin/PluginManagerTest.java b/src/test/java/org/bukkit/plugin/PluginManagerTest.java
index f188cd4f3..1941c9f49 100644
index f188cd4f..1941c9f4 100644
--- a/src/test/java/org/bukkit/plugin/PluginManagerTest.java
+++ b/src/test/java/org/bukkit/plugin/PluginManagerTest.java
@@ -17,7 +17,7 @@ public class PluginManagerTest {
@ -136,5 +136,5 @@ index f188cd4f3..1941c9f49 100644
@Test
public void testRemovePermissionByNameLower() {
--
2.25.0
2.26.0

8
Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch
View File

@ -1,4 +1,4 @@
From 95f8aab973c23ae9661bd35f135f30589ab91a88 Mon Sep 17 00:00:00 2001
From 71e820cd9199e5769916ef29cb8bfd68fccd6e69 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 4 Aug 2018 19:37:35 -0400
Subject: [PATCH] Provide Chunk Coordinates as a Long API
@ -44,10 +44,10 @@ index 95e485ee..0bbef14a 100644
* Gets the world containing this chunk
*
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index f82063af..ae414b51 100644
index 889756b1..e5b76d59 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -206,6 +206,22 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -207,6 +207,22 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull
public Chunk getChunkAt(@NotNull Block block);
@ -71,5 +71,5 @@ index f82063af..ae414b51 100644
* Checks if the specified {@link Chunk} is loaded
*
--
2.25.0
2.26.0

8
Spigot-API-Patches/0133-Async-Chunks-API.patch
View File

@ -1,4 +1,4 @@
From 3392ff505d528572bbfe41cecebb034b2ae07cb4 Mon Sep 17 00:00:00 2001
From 775e6d021b5fa6c80f2d2112ae78ffc3ad23a3ab Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 17:43:33 -0600
Subject: [PATCH] Async Chunks API
@ -8,10 +8,10 @@ Adds API's to load or generate chunks asynchronously.
Also adds utility methods to Entity to teleport asynchronously.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index ae414b51..a62663b2 100644
index e5b76d59..62aa9bd6 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -220,6 +220,358 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -221,6 +221,358 @@ public interface World extends PluginMessageRecipient, Metadatable {
public default Chunk getChunkAt(long chunkKey) {
return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
}
@ -406,5 +406,5 @@ index b4069dbf..45e0dffe 100644
* Returns a list of entities within a bounding box centered around this
* entity
--
2.25.0
2.26.0

8
Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch
View File

@ -1,14 +1,14 @@
From 6b5294396cb7b80079abf2691ff673493fbb5bfe Mon Sep 17 00:00:00 2001
From 79d2dcccbb690008cb1dfa0ce57d2f8a36900496 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 10 Aug 2018 22:08:34 -0400
Subject: [PATCH] Make EnderDragon extend Mob
diff --git a/src/main/java/org/bukkit/entity/EnderDragon.java b/src/main/java/org/bukkit/entity/EnderDragon.java
index 16199b3e..ddef550b 100644
index c14278d2..92da609f 100644
--- a/src/main/java/org/bukkit/entity/EnderDragon.java
+++ b/src/main/java/org/bukkit/entity/EnderDragon.java
@@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull;
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable;
/**
* Represents an Ender Dragon
*/
@ -18,5 +18,5 @@ index 16199b3e..ddef550b 100644
/**
* Represents a phase or action that an Ender Dragon can perform.
--
2.25.0.windows.1
2.26.0

8
Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch
View File

@ -1,4 +1,4 @@
From f440565394b29fc10255bf6770adaead86eac9b7 Mon Sep 17 00:00:00 2001
From fdcc921f5d5f2e11ad8e37d016bb5e87016e0e10 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Tue, 14 Aug 2018 21:42:10 -0700
Subject: [PATCH] Allow Blocks to be accessed via a long key
@ -48,10 +48,10 @@ index f87ecd0a..07e532cd 100644
* @return A new location where X/Y/Z are the center of the block
*/
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 310041ae..5bf2ba6f 100644
index 62aa9bd6..64308c1f 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -89,6 +89,38 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -90,6 +90,38 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull
public Block getBlockAt(@NotNull Location location);
@ -168,5 +168,5 @@ index af4ffada..87185a81 100644
* Gets the Location of the block
*
--
2.25.0.windows.1
2.26.0

8
Spigot-API-Patches/0139-isChunkGenerated-API.patch
View File

@ -1,4 +1,4 @@
From 6a29ae93dfaeecf54eb718c7a35fdbfb1008e72e Mon Sep 17 00:00:00 2001
From 3d39d42557abe1eaab4544ad72fdfc5207b1ccf6 Mon Sep 17 00:00:00 2001
From: cswhite2000 <18whitechristop@gmail.com>
Date: Tue, 21 Aug 2018 19:39:46 -0700
Subject: [PATCH] isChunkGenerated API
@ -34,10 +34,10 @@ index 07e532cd..6e1a1124 100644
/**
* Sets the position of this Location and returns itself
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index e291c544..5366d205 100644
index 64308c1f..b7ad4f56 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -253,6 +253,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -254,6 +254,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
}
@ -56,5 +56,5 @@ index e291c544..5366d205 100644
* This is the Legacy API before Java 8 was supported. Java 8 Consumer is provided,
* as well as future support
--
2.25.0
2.26.0

10
Spigot-API-Patches/0158-Add-sun-related-API.patch
View File

@ -1,14 +1,14 @@
From 192bb200ebeadeabe5d775797a033c15cbb63a82 Mon Sep 17 00:00:00 2001
From 0889f7c87d88415878c52224204f17bcf12d4e83 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 7 Oct 2018 00:54:15 -0500
Subject: [PATCH] Add sun related API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 5366d205..d0256af5 100644
index b7ad4f56..c88f1724 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1645,6 +1645,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1646,6 +1646,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public void setFullTime(long time);
@ -26,7 +26,7 @@ index 5366d205..d0256af5 100644
* Returns whether the world has an ongoing storm.
*
diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
index afdc103f..784db447 100644
index b1322878..d726453c 100644
--- a/src/main/java/org/bukkit/entity/Mob.java
+++ b/src/main/java/org/bukkit/entity/Mob.java
@@ -16,6 +16,13 @@ public interface Mob extends LivingEntity, Lootable {
@ -44,5 +44,5 @@ index afdc103f..784db447 100644
/**
--
2.25.0
2.26.0

8
Spigot-API-Patches/0181-Add-Heightmap-API.patch
View File

@ -1,4 +1,4 @@
From bdfb8acea9f01a1fcceca8598a330c073777ac3e Mon Sep 17 00:00:00 2001
From ea93c9776bf204f612644a53d96fb4d64607baff Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sat, 1 Dec 2018 19:00:36 -0800
Subject: [PATCH] Add Heightmap API
@ -89,10 +89,10 @@ index 77d9cd0a..59047503 100644
* Creates explosion at this location with given power
*
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index d0256af5..5047be15 100644
index c88f1724..db18f70e 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -159,6 +159,87 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -160,6 +160,87 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull
public Block getHighestBlockAt(@NotNull Location location);
@ -181,5 +181,5 @@ index d0256af5..5047be15 100644
* Gets the highest coordinate corresponding to the {@link HeightMap} at the
* given coordinates.
--
2.25.0
2.26.0

26
Spigot-Server-Patches/0003-MC-Dev-fixes.patch
View File

@ -1,4 +1,4 @@
From e1f1e03c209bac8c167db7e56d5859d3777e484d Mon Sep 17 00:00:00 2001
From 01161a76c5123a08b7eade5ab1aaf8ad24c97bc7 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 30 Mar 2016 19:36:20 -0400
Subject: [PATCH] MC Dev fixes
@ -179,28 +179,6 @@ index 2dd27edc83..6def3616ef 100644
}));
CraftingManager.LOGGER.info("Loaded {} recipes", map1.size());
}
diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
index f2c0e06bab..909d13c427 100644
--- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
+++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
@@ -376,7 +376,7 @@ public class EnderDragonBattle {
private void a(BlockPosition blockposition) {
this.d.triggerEffect(3000, blockposition, 0);
- WorldGenerator.END_GATEWAY.b((WorldGenFeatureConfiguration) WorldGenEndGatewayConfiguration.a()).a(this.d, this.d.getChunkProvider().getChunkGenerator(), new Random(), blockposition);
+ WorldGenerator.END_GATEWAY.b(WorldGenEndGatewayConfiguration.a()).a(this.d, this.d.getChunkProvider().getChunkGenerator(), new Random(), blockposition); // Paper - decompile fix
}
private void a(boolean flag) {
@@ -388,7 +388,7 @@ public class EnderDragonBattle {
}
}
- worldgenendtrophy.b((WorldGenFeatureConfiguration) WorldGenFeatureConfiguration.e).a(this.d, this.d.getChunkProvider().getChunkGenerator(), new Random(), this.o);
+ worldgenendtrophy.b(WorldGenFeatureConfiguration.e).a(this.d, this.d.getChunkProvider().getChunkGenerator(), new Random(), this.o); // Paper - decompile fix
}
private EntityEnderDragon o() {
diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
index 7d44348c78..73ecdd22ea 100644
--- a/src/main/java/net/minecraft/server/EntityVindicator.java
@ -735,5 +713,5 @@ index 55fe7625af..19e68a7831 100644
t0.a(nbttagcompound.getCompound("data"));
--
2.25.0.windows.1
2.26.0

8
Spigot-Server-Patches/0138-Provide-E-TE-Chunk-count-stat-methods.patch
View File

@ -1,4 +1,4 @@
From 5400af4052dd232cf9e2be9e1a6d73f9db1de5f9 Mon Sep 17 00:00:00 2001
From 171ede11261f5166ac6ba2d8323b8125c638eb45 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 7 Jan 2017 15:24:46 -0500
Subject: [PATCH] Provide E/TE/Chunk count stat methods
@ -7,10 +7,10 @@ Provides counts without the ineffeciency of using .getEntities().size()
which creates copy of the collections.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 5b03ff709..a41b32ddc 100644
index 16b78bd02e..c06b10c6b1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -274,6 +274,48 @@ public class CraftWorld implements World {
@@ -278,6 +278,48 @@ public class CraftWorld implements World {
private int waterAnimalSpawn = -1;
private int ambientSpawn = -1;
@ -60,5 +60,5 @@ index 5b03ff709..a41b32ddc 100644
public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
--
2.25.0
2.26.0

8
Spigot-Server-Patches/0141-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
View File

@ -1,4 +1,4 @@
From d4538e81dbb8445b87043c86a2c1ada843ab6283 Mon Sep 17 00:00:00 2001
From 365d0c142448b87a423117a3bdaffcf1f4c53739 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 19 Dec 2017 16:31:46 -0500
Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@ -265,10 +265,10 @@ index 8dc47452a4..560e2f42b7 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index a41b32ddc7..462458645e 100644
index c06b10c6b1..d3df3f593f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1791,7 +1791,7 @@ public class CraftWorld implements World {
@@ -1795,7 +1795,7 @@ public class CraftWorld implements World {
} else if (TNTPrimed.class.isAssignableFrom(clazz)) {
entity = new EntityTNTPrimed(world, x, y, z, null);
} else if (ExperienceOrb.class.isAssignableFrom(clazz)) {
@ -301,5 +301,5 @@ index 1b512cc45c..fbad045675 100644
public EntityExperienceOrb getHandle() {
return (EntityExperienceOrb) entity;
--
2.25.0
2.26.0

8
Spigot-Server-Patches/0219-Expand-World.spawnParticle-API-and-add-Builder.patch
View File

@ -1,4 +1,4 @@
From 671179f55b30b76b799ab240cf8f146e57be50a5 Mon Sep 17 00:00:00 2001
From 2e74c7dc378fae5556ce1aa66d24e73e0668137c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 15 Aug 2017 22:29:12 -0400
Subject: [PATCH] Expand World.spawnParticle API and add Builder
@ -43,10 +43,10 @@ index eb99f3a967..da391e945c 100644
if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 8e1057cdca..367da203ac 100644
index d3df3f593f..daf305bb14 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2281,11 +2281,17 @@ public class CraftWorld implements World {
@@ -2285,11 +2285,17 @@ public class CraftWorld implements World {
@Override
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) {
@ -66,5 +66,5 @@ index 8e1057cdca..367da203ac 100644
x, y, z, // Position
count, // Count
--
2.25.2
2.26.0

8
Spigot-Server-Patches/0223-Allow-spawning-Item-entities-with-World.spawnEntity.patch
View File

@ -1,4 +1,4 @@
From ada5d8374f14438decfc9e9f9802bf64677b354b Mon Sep 17 00:00:00 2001
From f6cacd52c4f68c8acc21058322ede92a35b7a3ca Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 4 Jun 2018 20:39:20 -0400
Subject: [PATCH] Allow spawning Item entities with World.spawnEntity
@ -8,10 +8,10 @@ This API has more capabilities than .dropItem with the Consumer function
Item can be set inside of the Consumer pre spawn function.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 451cc0c2d..aefa7bb18 100644
index daf305bb14..0b4821e16e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1483,6 +1483,10 @@ public class CraftWorld implements World {
@@ -1487,6 +1487,10 @@ public class CraftWorld implements World {
if (Boat.class.isAssignableFrom(clazz)) {
entity = new EntityBoat(world, x, y, z);
entity.setPositionRotation(x, y, z, yaw, pitch);
@ -23,5 +23,5 @@ index 451cc0c2d..aefa7bb18 100644
entity = new EntityFallingBlock(world, x, y, z, world.getType(new BlockPosition(x, y, z)));
} else if (Projectile.class.isAssignableFrom(clazz)) {
--
2.25.0
2.26.0

8
Spigot-Server-Patches/0236-Expand-Explosions-API.patch
View File

@ -1,4 +1,4 @@
From 5652c286dae234aefa2136dd3db4575e7e7012f8 Mon Sep 17 00:00:00 2001
From aa958e0608ea7ac4b5d65e573be50869112e6dce Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 20 Jun 2018 23:17:24 -0400
Subject: [PATCH] Expand Explosions API
@ -6,10 +6,10 @@ Subject: [PATCH] Expand Explosions API
Add Entity as a Source capability, and add more API choices, and on Location.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index f5a3dd484..9552d409e 100644
index 0b4821e16e..1787c2d205 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -871,6 +871,11 @@ public class CraftWorld implements World {
@@ -875,6 +875,11 @@ public class CraftWorld implements World {
public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks, Entity source) {
return !world.createExplosion(source == null ? null : ((CraftEntity) source).getHandle(), x, y, z, power, setFire, breakBlocks ? Explosion.Effect.BREAK : Explosion.Effect.NONE).wasCanceled;
}
@ -22,5 +22,5 @@ index f5a3dd484..9552d409e 100644
@Override
public boolean createExplosion(Location loc, float power) {
--
2.25.1
2.26.0

16
Spigot-Server-Patches/0239-Add-config-to-disable-ender-dragon-legacy-check.patch
View File

@ -1,11 +1,11 @@
From c5fcf0e51be374de58eb2beac360264b84354a20 Mon Sep 17 00:00:00 2001
From 681f7cdd26add17101f6aa16c282001192ba78f9 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 22 Jun 2018 10:38:31 -0500
Subject: [PATCH] Add config to disable ender dragon legacy check
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 33ce9a500..cea15d50e 100644
index 33ce9a5004..cea15d50ed 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -372,4 +372,9 @@ public class PaperWorldConfig {
@ -19,7 +19,7 @@ index 33ce9a500..cea15d50e 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
index 909d13c42..218c04245 100644
index 0674811849..687efa022d 100644
--- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
+++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
@@ -28,10 +28,10 @@ public class EnderDragonBattle {
@ -29,11 +29,11 @@ index 909d13c42..218c04245 100644
- private boolean k;
+ private boolean k; private void setDragonKilled(boolean dragonKilled) { this.k = dragonKilled; } // Paper - OBFHELPER
private boolean l;
private UUID m;
public UUID m; // CraftBukkit PAIL private -> public, rename dragonUUID
- private boolean n;
+ private boolean n; private void setScanForLegacyFight(boolean scanForLegacyFight) { this.n = scanForLegacyFight; } private boolean scanForLegacyFight() { return this.n; } // Paper - OBFHELPER
private BlockPosition o;
private EnumDragonRespawn p;
+ private boolean n; private void setScanForLegacyFight(boolean scanForLegacyFight) { this.n = scanForLegacyFight; } private boolean scanForLegacyFight() { return this.n; } // Paper - OBFHELPER
public BlockPosition o; // CraftBukkit PAIL private -> public, rename portalLocation
public EnumDragonRespawn p; // CraftBukkit PAIL private -> public, rename respawnPhase
private int q;
@@ -41,6 +41,10 @@ public class EnderDragonBattle {
this.bossBattle = (BossBattleServer) (new BossBattleServer(new ChatMessage("entity.minecraft.ender_dragon", new Object[0]), BossBattle.BarColor.PINK, BossBattle.BarStyle.PROGRESS)).setPlayMusic(true).c(true);
@ -47,5 +47,5 @@ index 909d13c42..218c04245 100644
if (nbttagcompound.hasKeyOfType("DragonKilled", 99)) {
if (nbttagcompound.b("DragonUUID")) {
--
2.25.1
2.26.0

8
Spigot-Server-Patches/0240-Implement-World.getEntity-UUID-API.patch
View File

@ -1,14 +1,14 @@
From f44b556e643f7c249f90b209f3d588c52994eeb3 Mon Sep 17 00:00:00 2001
From 79bd2ca7d9fa8e0c52298b9a0376b05c12bfd862 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Tue, 3 Jul 2018 16:08:14 +0200
Subject: [PATCH] Implement World.getEntity(UUID) API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 9552d409e..05a6b2504 100644
index 1787c2d205..588c87119f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1285,6 +1285,15 @@ public class CraftWorld implements World {
@@ -1289,6 +1289,15 @@ public class CraftWorld implements World {
return list;
}
@ -25,5 +25,5 @@ index 9552d409e..05a6b2504 100644
public void save() {
org.spigotmc.AsyncCatcher.catchOp("world save"); // Spigot
--
2.25.1
2.26.0

14
Spigot-Server-Patches/0263-Ignore-Dead-Entities-in-entityList-iteration.patch
View File

@ -1,4 +1,4 @@
From c3dd7b10963f9558e56a3276b6061082c2b31aa8 Mon Sep 17 00:00:00 2001
From cd8b776c5d89065e2715a57d5c53906bcb241c62 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 28 Jul 2018 12:18:27 -0400
Subject: [PATCH] Ignore Dead Entities in entityList iteration
@ -92,10 +92,10 @@ index 6ce7f77a5e..c13aefff94 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 05a6b25045..326c3564ce 100644
index 588c87119f..e94ac028df 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1021,6 +1021,7 @@ public class CraftWorld implements World {
@@ -1025,6 +1025,7 @@ public class CraftWorld implements World {
for (Object o : world.entitiesById.values()) {
if (o instanceof net.minecraft.server.Entity) {
net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o;
@ -103,7 +103,7 @@ index 05a6b25045..326c3564ce 100644
Entity bukkitEntity = mcEnt.getBukkitEntity();
// Assuming that bukkitEntity isn't null
@@ -1040,6 +1041,7 @@ public class CraftWorld implements World {
@@ -1044,6 +1045,7 @@ public class CraftWorld implements World {
for (Object o : world.entitiesById.values()) {
if (o instanceof net.minecraft.server.Entity) {
net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o;
@ -111,7 +111,7 @@ index 05a6b25045..326c3564ce 100644
Entity bukkitEntity = mcEnt.getBukkitEntity();
// Assuming that bukkitEntity isn't null
@@ -1066,6 +1068,7 @@ public class CraftWorld implements World {
@@ -1070,6 +1072,7 @@ public class CraftWorld implements World {
for (Object entity: world.entitiesById.values()) {
if (entity instanceof net.minecraft.server.Entity) {
@ -119,7 +119,7 @@ index 05a6b25045..326c3564ce 100644
Entity bukkitEntity = ((net.minecraft.server.Entity) entity).getBukkitEntity();
if (bukkitEntity == null) {
@@ -1089,6 +1092,7 @@ public class CraftWorld implements World {
@@ -1093,6 +1096,7 @@ public class CraftWorld implements World {
for (Object entity: world.entitiesById.values()) {
if (entity instanceof net.minecraft.server.Entity) {
@ -128,5 +128,5 @@ index 05a6b25045..326c3564ce 100644
if (bukkitEntity == null) {
--
2.25.2
2.26.0

8
Spigot-Server-Patches/0279-Send-nearby-packets-from-world-player-list-not-serve.patch
View File

@ -1,4 +1,4 @@
From ea40fb4a20c965f87a9f9af89697d5995e231547 Mon Sep 17 00:00:00 2001
From 6591167e389c3cef67b3ba8c1c255bfd77081b2e Mon Sep 17 00:00:00 2001
From: Mystiflow <mystiflow@gmail.com>
Date: Fri, 6 Jul 2018 13:21:30 +0100
Subject: [PATCH] Send nearby packets from world player list not server list
@ -68,10 +68,10 @@ index c13aefff94..2b2b547034 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 326c3564ce..fe0912c06c 100644
index e94ac028df..d61769b4f2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2116,7 +2116,7 @@ public class CraftWorld implements World {
@@ -2120,7 +2120,7 @@ public class CraftWorld implements World {
double z = loc.getZ();
PacketPlayOutCustomSoundEffect packet = new PacketPlayOutCustomSoundEffect(new MinecraftKey(sound), SoundCategory.valueOf(category.name()), new Vec3D(x, y, z), volume, pitch);
@ -81,5 +81,5 @@ index 326c3564ce..fe0912c06c 100644
private static Map<String, GameRules.GameRuleKey<?>> gamerules;
--
2.25.2
2.26.0

8
Spigot-Server-Patches/0289-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch
View File

@ -1,4 +1,4 @@
From 34fad952972d6d653e377a4c48733dbabc6a5431 Mon Sep 17 00:00:00 2001
From fcc30f0d55b5b89b772030d90d81db5823001c6f Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sun, 2 Sep 2018 19:34:33 -0700
Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
@ -6,10 +6,10 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index fe0912c06..9940b9520 100644
index d61769b4f2..6e1ae94cea 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -495,7 +495,7 @@ public class CraftWorld implements World {
@@ -499,7 +499,7 @@ public class CraftWorld implements World {
@Override
public boolean loadChunk(int x, int z, boolean generate) {
org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot
@ -19,5 +19,5 @@ index fe0912c06..9940b9520 100644
// If generate = false, but the chunk already exists, we will get this back.
if (chunk instanceof ProtoChunkExtension) {
--
2.25.1
2.26.0

12
Spigot-Server-Patches/0310-Add-sun-related-API.patch
View File

@ -1,11 +1,11 @@
From 9b1e5a4f47ad58077b804230c5f7a2f5d8999824 Mon Sep 17 00:00:00 2001
From 3e5915a5ebe9224483503e023e4fb220b46a34b6 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 7 Oct 2018 00:54:21 -0500
Subject: [PATCH] Add sun related API
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index b5816dc89..bed15873b 100644
index b5816dc89e..bed15873b6 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -1341,6 +1341,7 @@ public abstract class EntityInsentient extends EntityLiving {
@ -17,10 +17,10 @@ index b5816dc89..bed15873b 100644
if (this.world.isDay() && !this.world.isClientSide) {
float f = this.aI();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 9940b9520..b41404652 100644
index 6e1ae94cea..06b2e8b910 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -852,6 +852,13 @@ public class CraftWorld implements World {
@@ -856,6 +856,13 @@ public class CraftWorld implements World {
}
}
@ -35,7 +35,7 @@ index 9940b9520..b41404652 100644
public boolean createExplosion(double x, double y, double z, float power) {
return createExplosion(x, y, z, power, false, true);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
index c89bc7024..eaad222fd 100644
index c89bc7024b..eaad222fd3 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
@@ -78,4 +78,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
@ -51,5 +51,5 @@ index c89bc7024..eaad222fd 100644
+ // Paper end
}
--
2.25.1
2.26.0

10
Spigot-Server-Patches/0365-Add-Heightmap-API.patch
View File

@ -1,11 +1,11 @@
From c469162763fcd7293f6c41be4a49f2bc4190ee16 Mon Sep 17 00:00:00 2001
From c9c4eeb2a922810a03372f2fef80f6de1e5c48fe Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Tue, 1 Jan 2019 02:22:01 -0800
Subject: [PATCH] Add Heightmap API
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 4aca398f1..20d9dd839 100644
index 4aca398f10..20d9dd839c 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -571,8 +571,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@ -20,10 +20,10 @@ index 4aca398f1..20d9dd839 100644
if (i >= -30000000 && j >= -30000000 && i < 30000000 && j < 30000000) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index b41404652..d4ccef12f 100644
index 06b2e8b910..693dc983cd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -335,6 +335,29 @@ public class CraftWorld implements World {
@@ -339,6 +339,29 @@ public class CraftWorld implements World {
return getHighestBlockYAt(x, z, org.bukkit.HeightMap.MOTION_BLOCKING);
}
@ -54,5 +54,5 @@ index b41404652..d4ccef12f 100644
public Location getSpawnLocation() {
BlockPosition spawn = world.getSpawn();
--
2.25.1
2.26.0

8
Spigot-Server-Patches/0373-improve-CraftWorld-isChunkLoaded.patch
View File

@ -1,4 +1,4 @@
From b212266cc60a592987ff34b1f5c51793b52366d7 Mon Sep 17 00:00:00 2001
From 8d626cf3e3891730f6744993b993d5dae8192920 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 21 May 2019 02:34:04 +0100
Subject: [PATCH] improve CraftWorld#isChunkLoaded
@ -9,10 +9,10 @@ waiting for the execution queue to get to our request; We can just query
the chunk status and get a response now, vs having to wait
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index d4ccef12f..41d1c3bb6 100644
index 693dc983cd..8b6d22e710 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -399,14 +399,13 @@ public class CraftWorld implements World {
@@ -403,14 +403,13 @@ public class CraftWorld implements World {
@Override
public boolean isChunkLoaded(int x, int z) {
@ -30,5 +30,5 @@ index d4ccef12f..41d1c3bb6 100644
throw new RuntimeException(ex);
}
--
2.25.1
2.26.0

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

@ -1,4 +1,4 @@
From 69bd2794444835a43e7a35f99297d9c0514653c5 Mon Sep 17 00:00:00 2001
From 0abcca16fedd201c9695f0adbe334a3f35bffe13 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
@ -207,10 +207,10 @@ index ea3a890027..f4ee20efd9 100644
public LongSet getForceLoadedChunks() {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 41d1c3bb62..ecc10a4f7a 100644
index 8b6d22e710..661a89c5d6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1924,15 +1924,21 @@ public class CraftWorld implements World {
@@ -1928,15 +1928,21 @@ public class CraftWorld implements World {
@Override
public void setKeepSpawnInMemory(boolean keepLoaded) {
@ -237,5 +237,5 @@ index 41d1c3bb62..ecc10a4f7a 100644
@Override
--
2.25.2
2.26.0

26
Spigot-Server-Patches/0382-Fix-World-isChunkGenerated-calls.patch
View File

@ -1,4 +1,4 @@
From db9afa41e43fb9c26ff1ff68785845156669b213 Mon Sep 17 00:00:00 2001
From e31061be086397e57fc5dcd618404481cf45437b Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sat, 15 Jun 2019 08:54:33 -0700
Subject: [PATCH] Fix World#isChunkGenerated calls
@ -8,7 +8,7 @@ This patch also adds a chunk status cache on region files (note that
its only purpose is to cache the status on DISK)
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index d2ec089e8..21498da29 100644
index 462b224dfe..b582171c51 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -28,7 +28,7 @@ public class ChunkProviderServer extends IChunkProvider {
@ -43,7 +43,7 @@ index d2ec089e8..21498da29 100644
@Nullable
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 6371f2f5b..961228e9d 100644
index 6371f2f5b1..961228e9df 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -391,6 +391,17 @@ public class ChunkRegionLoader {
@ -65,7 +65,7 @@ index 6371f2f5b..961228e9d 100644
if (nbttagcompound != null) {
ChunkStatus chunkstatus = ChunkStatus.a(nbttagcompound.getCompound("Level").getString("Status"));
diff --git a/src/main/java/net/minecraft/server/ChunkStatus.java b/src/main/java/net/minecraft/server/ChunkStatus.java
index efdf611e6..134a4f0b7 100644
index efdf611e66..134a4f0b7d 100644
--- a/src/main/java/net/minecraft/server/ChunkStatus.java
+++ b/src/main/java/net/minecraft/server/ChunkStatus.java
@@ -176,6 +176,7 @@ public class ChunkStatus {
@ -95,7 +95,7 @@ index efdf611e6..134a4f0b7 100644
return (ChunkStatus) IRegistry.CHUNK_STATUS.get(MinecraftKey.a(s));
}
diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java
index f0a052eec..2f95174fc 100644
index f0a052eec2..2f95174fcc 100644
--- a/src/main/java/net/minecraft/server/IChunkLoader.java
+++ b/src/main/java/net/minecraft/server/IChunkLoader.java
@@ -8,7 +8,7 @@ import javax.annotation.Nullable;
@ -108,7 +108,7 @@ index f0a052eec..2f95174fc 100644
@Nullable
private PersistentStructureLegacy c;
diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
index 66a389a67..027a6b0fd 100644
index 66a389a67e..027a6b0fd2 100644
--- a/src/main/java/net/minecraft/server/PlayerChunk.java
+++ b/src/main/java/net/minecraft/server/PlayerChunk.java
@@ -114,6 +114,19 @@ public class PlayerChunk {
@ -132,7 +132,7 @@ index 66a389a67..027a6b0fd 100644
public CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> getStatusFutureUnchecked(ChunkStatus chunkstatus) {
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index 5c28ccc00..04728dca7 100644
index 5c28ccc004..04728dca77 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -967,12 +967,62 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@ -201,7 +201,7 @@ index 5c28ccc00..04728dca7 100644
// Spigot start
return isOutsideOfRange(chunkcoordintpair, false);
diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
index 6b543f89d..d37abf2cf 100644
index 6b543f89d4..d37abf2cf3 100644
--- a/src/main/java/net/minecraft/server/RegionFile.java
+++ b/src/main/java/net/minecraft/server/RegionFile.java
@@ -36,6 +36,30 @@ public class RegionFile implements AutoCloseable {
@ -250,7 +250,7 @@ index 6b543f89d..d37abf2cf 100644
this.c();
} finally {
diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
index b3d1bb5fd..e07ae9854 100644
index b3d1bb5fd8..e07ae98540 100644
--- a/src/main/java/net/minecraft/server/RegionFileCache.java
+++ b/src/main/java/net/minecraft/server/RegionFileCache.java
@@ -18,7 +18,14 @@ public final class RegionFileCache implements AutoCloseable {
@ -280,7 +280,7 @@ index b3d1bb5fd..e07ae9854 100644
throwable = throwable1;
throw throwable1;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index ecc10a4f7..7ae9f8ab5 100644
index 661a89c5d6..a71bb86508 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -18,6 +18,7 @@ import java.util.Objects;
@ -291,7 +291,7 @@ index ecc10a4f7..7ae9f8ab5 100644
import java.util.function.Predicate;
import java.util.stream.Collectors;
import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
@@ -404,8 +405,22 @@ public class CraftWorld implements World {
@@ -408,8 +409,22 @@ public class CraftWorld implements World {
@Override
public boolean isChunkGenerated(int x, int z) {
@ -315,7 +315,7 @@ index ecc10a4f7..7ae9f8ab5 100644
} catch (IOException ex) {
throw new RuntimeException(ex);
}
@@ -517,20 +532,49 @@ public class CraftWorld implements World {
@@ -521,20 +536,49 @@ public class CraftWorld implements World {
@Override
public boolean loadChunk(int x, int z, boolean generate) {
org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot
@ -376,5 +376,5 @@ index ecc10a4f7..7ae9f8ab5 100644
@Override
--
2.25.1
2.26.0

19
Spigot-Server-Patches/0392-Asynchronous-chunk-IO-and-loading.patch
View File

@ -1,4 +1,4 @@
From f2c303cd7f272183bc4a916550d447a6a63fdbaf Mon Sep 17 00:00:00 2001
From 0cf0f921e83dd698df146baff3bc1da04fecb2c1 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sat, 13 Jul 2019 09:23:10 -0700
Subject: [PATCH] Asynchronous chunk IO and loading
@ -3933,7 +3933,7 @@ index c999f8c9bf..b59ef1a633 100644
HAS_SPACE(VillagePlaceRecord::d), IS_OCCUPIED(VillagePlaceRecord::e), ANY((villageplacerecord) -> {
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 30a50afafe..5c8894840b 100644
index 5063544a44..2b22bf5090 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -82,6 +82,79 @@ public class WorldServer extends World {
@ -4026,10 +4026,10 @@ index 30a50afafe..5c8894840b 100644
// CraftBukkit start
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 7ae9f8ab56..defee67226 100644
index a71bb86508..1d275520fb 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -550,22 +550,23 @@ public class CraftWorld implements World {
@@ -554,22 +554,23 @@ public class CraftWorld implements World {
return true;
}
@ -4061,10 +4061,10 @@ index 7ae9f8ab56..defee67226 100644
// fall through to load
// we do this so we do not re-read the chunk data on disk
@@ -2426,6 +2427,25 @@ public class CraftWorld implements World {
return persistentRaid.raids.values().stream().map(CraftRaid::new).collect(Collectors.toList());
}
@@ -2439,6 +2440,24 @@ public class CraftWorld implements World {
return new CraftDragonBattle(((WorldProviderTheEnd) worldProvider).o()); // PAIL rename getDragonBattle
}
+ // Paper start
+ @Override
+ public CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen) {
@ -4083,10 +4083,9 @@ index 7ae9f8ab56..defee67226 100644
+ return ret;
+ }
+ // Paper end
+
// Spigot start
@Override
public int getViewDistance() {
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
index 07936eeba2..5bdcdcf9e8 100644
--- a/src/main/java/org/spigotmc/WatchdogThread.java
@ -4108,5 +4107,5 @@ index 07936eeba2..5bdcdcf9e8 100644
log.log( Level.SEVERE, "------------------------------" );
//
--
2.25.2
2.26.0

8
Spigot-Server-Patches/0406-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
View File

@ -1,4 +1,4 @@
From 049c199629e4cb8738280b1e3ac14d86afb2180d Mon Sep 17 00:00:00 2001
From 72aba67024744cb9608ae2e5fcb860d7ad9d93c3 Mon Sep 17 00:00:00 2001
From: MisterErwin <git@askarian.net>
Date: Wed, 30 Oct 2019 16:57:54 +0100
Subject: [PATCH] Fix spawning of hanging entities that are not ItemFrames and
@ -6,10 +6,10 @@ Subject: [PATCH] Fix spawning of hanging entities that are not ItemFrames and
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index defee6722..1a5ee3410 100644
index 1d275520fb..051506fce8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1842,7 +1842,12 @@ public class CraftWorld implements World {
@@ -1846,7 +1846,12 @@ public class CraftWorld implements World {
height = 9;
}
@ -24,5 +24,5 @@ index defee6722..1a5ee3410 100644
for (BlockFace dir : faces) {
IBlockData nmsBlock = world.getType(pos.shift(CraftBlock.blockFaceToNotch(dir)));
--
2.25.1
2.26.0

31
Spigot-Server-Patches/0448-Call-BlockRedstoneEvent-for-fence-gates.patch
View File

@ -1,31 +0,0 @@
From 2683d17019e4a67b114868db084a31c5673a436a Mon Sep 17 00:00:00 2001
From: Jan Boerman <Janboerman95@gmail.com>
Date: Sat, 14 Mar 2020 14:17:35 +0100
Subject: [PATCH] Call BlockRedstoneEvent for fence gates
diff --git a/src/main/java/net/minecraft/server/BlockFenceGate.java b/src/main/java/net/minecraft/server/BlockFenceGate.java
index 432e47bb99..583eb68837 100644
--- a/src/main/java/net/minecraft/server/BlockFenceGate.java
+++ b/src/main/java/net/minecraft/server/BlockFenceGate.java
@@ -103,6 +103,17 @@ public class BlockFenceGate extends BlockFacingHorizontal {
public void doPhysics(IBlockData iblockdata, World world, BlockPosition blockposition, Block block, BlockPosition blockposition1, boolean flag) {
if (!world.isClientSide) {
boolean flag1 = world.isBlockIndirectlyPowered(blockposition);
+ // Paper start
+ boolean isOldPowered = iblockdata.get(BlockFenceGate.POWERED);
+ if (flag1 != isOldPowered) {
+ int newPower = flag1 ? 15 : 0;
+ int oldPower = isOldPowered ? 15 : 0;
+ org.bukkit.block.Block bukkitBlock = org.bukkit.craftbukkit.block.CraftBlock.at(world, blockposition);
+ org.bukkit.event.block.BlockRedstoneEvent eventRedstone = new org.bukkit.event.block.BlockRedstoneEvent(bukkitBlock, oldPower, newPower);
+ world.getServer().getPluginManager().callEvent(eventRedstone);
+ flag1 = eventRedstone.getNewCurrent() > 0;
+ }
+ // Paper end
if ((Boolean) iblockdata.get(BlockFenceGate.POWERED) != flag1) {
world.setTypeAndData(blockposition, (IBlockData) ((IBlockData) iblockdata.set(BlockFenceGate.POWERED, flag1)).set(BlockFenceGate.OPEN, flag1), 2);
--
2.25.1

8
Spigot-Server-Patches/0449-Optimise-Chunk-getFluid.patch → Spigot-Server-Patches/0448-Optimise-Chunk-getFluid.patch
View File

@ -1,4 +1,4 @@
From 514c65393f47c15140cc0ea5fe6f550efbd4631c Mon Sep 17 00:00:00 2001
From 636a069a7da1965fe082b2283baf4c1604a46a19 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Tue, 14 Jan 2020 14:59:08 -0800
Subject: [PATCH] Optimise Chunk#getFluid
@ -8,7 +8,7 @@ faster on its own, however removing the try catch makes it
easier to inline due to code size
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 92065fe02..07073af99 100644
index 92065fe029..07073af991 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -297,17 +297,20 @@ public class Chunk implements IChunkAccess {
@ -48,7 +48,7 @@ index 92065fe02..07073af99 100644
// CraftBukkit start
diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
index 8b28fb5ee..426221f7c 100644
index 8b28fb5ee1..426221f7c3 100644
--- a/src/main/java/net/minecraft/server/ChunkSection.java
+++ b/src/main/java/net/minecraft/server/ChunkSection.java
@@ -46,7 +46,7 @@ public class ChunkSection {
@ -61,5 +61,5 @@ index 8b28fb5ee..426221f7c 100644
public void a() {
--
2.25.1
2.26.0

4
Spigot-Server-Patches/0450-Optimise-TickListServer-by-rewriting-it.patch → Spigot-Server-Patches/0449-Optimise-TickListServer-by-rewriting-it.patch
View File

@ -1,4 +1,4 @@
From ba1ce65d933700f100d6156e3b8c1c617f8de19d Mon Sep 17 00:00:00 2001
From da5a4122600e0c528c55bd379e836a41b27be30d Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Fri, 14 Feb 2020 01:24:39 -0800
Subject: [PATCH] Optimise TickListServer by rewriting it
@ -1169,5 +1169,5 @@ index aa01f47c08..2de48e7537 100644
}, IRegistry.FLUID::getKey, IRegistry.FLUID::get, this::a, "Fluids"); // Paper - Timings
this.navigators = Sets.newHashSet();
--
2.25.2
2.26.0

2
work/Bukkit

@ -1 +1 @@
Subproject commit 6148fca75953d5f8f656453848137a018e11a5b3
Subproject commit 564ed1522adc76c68da2d1746df9e3a8a51cf5b6

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit fc2493409826a7fdcd2d69ab5d25ce8c492eb996
Subproject commit fc318cc10e26c66b36551a2d2562cecdb7410849

2
work/Spigot

@ -1 +1 @@
Subproject commit 6de3d4be46f609f86c968b58a4e5c12e90779fed
Subproject commit a03b1fdbaff792c6a1de74bd553fcb0d24f44849