mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-26 10:29:13 +00:00
* Init 1.21.6
* Finish API patches
* Apply purpur patches & all paper server patches
* Apply some
* Apply all
* Updated Upstream (Paper/Purpur)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@6aafe29e 1.21.6 dev
PaperMC/Paper@ae7c74ec tweak mob goal keys, generate missing api
PaperMC/Paper@9ea1460b Revert "fix sponge-absorb deleting chest content (#12647)"
Purpur Changes:
PurpurMC/Purpur@eb0ba67d Updated Upstream (Paper)
PurpurMC/Purpur@7c6502dc Updated Upstream (Paper)
PurpurMC/Purpur@aa289e2c Updated Upstream (Paper)
PurpurMC/Purpur@b1d412fb Updated Upstream (Paper)
PurpurMC/Purpur@293e28a0 use empty registryaccess where context is not needed, closes #1676
PurpurMC/Purpur@452bb319 port PaperMC/Paper#12654, closes #1665
PurpurMC/Purpur@849bc79c register test subcommands used for debugging, closes #1675
* Fix build & diff
* Update vanilla attribute size
* [ci/skip] Forget to remove this
* Updated Upstream (Paper/Purpur)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@a24f9b20 1.21.6 dev
PaperMC/Paper@457a0a69 Bump version string and protocol version to 1.21.6 release
PaperMC/Paper@245b5473 Update base to 1.21.6
PaperMC/Paper@b28d77b3 Update Moonrise to 1.21.6
PaperMC/Paper@8318dcb7 Update DataConverter to 1.21.6-rc1
Purpur Changes:
PurpurMC/Purpur@b228e316 Updated Upstream (Paper)
PurpurMC/Purpur@d6562a57 make happy ghast takes-damage-from-water and always-drop-exp options work
PurpurMC/Purpur@08d989b6 inline import
PurpurMC/Purpur@61d7f559 Updated Upstream (Paper)
PurpurMC/Purpur@469a4de5 Merge branch 'ver/1.21.5' into ver/1.21.6
* Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@d2b1158e Set correct world access on BSL snapshots
* Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@023e6c29 Ensure waypoints are per world
PaperMC/Paper@40d5d31c Fix recursively converting JSON Text Components
* Update spigot mapping to remap reobf mapping to mojamp for plugins
* Updated Upstream (Paper/Purpur)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@1fcc4162 Implement FeatureHooks#isChunkSent for Moonrise chunk system
PaperMC/Paper@e4d7178a Implement WaypointTransmitter#isChunkVisible
PaperMC/Paper@8980ead7 Directly walk text component after converting from JSON
PaperMC/Paper@5613ed6d Provide env environment variable and copy spigots sys prop for overriding default repository
PaperMC/Paper@62b7f86d Avoid and discourage use of Maven Central as a CDN (#12689)
PaperMC/Paper@f5534cb7 [ci/skip] Run generators (#12691)
PaperMC/Paper@4781d28b Re-add Log4j Javadocs (#12693)
PaperMC/Paper@74fbcce5 Check type of Material in get/set stats (#12607)
PaperMC/Paper@4b3f967e Improve Fix MC-44654 (#12703)
PaperMC/Paper@a7dd2635 Enable spigot obfuscation support (#12695)
PaperMC/Paper@6a51c44e Cleanup Primed TNT Fix (#12704)
PaperMC/Paper@839c6a18 Fix #11169 (#12706)
PaperMC/Paper@c77d5f99 Fix MC-297591
PaperMC/Paper@219f86ee Implement chunk unload delay config option
PaperMC/Paper@e4eb69b8 Do not allow ticket level decreases to be processed asynchronously
PaperMC/Paper@71b0c768 Adds support for vanilla negative explosions (#12705)
PaperMC/Paper@3750927a [ci/skip] Fix PermissionManager#clearPermissions() docs bad wording (#12657)
PaperMC/Paper@d61a51e8 Add ItemType#getBurnDuration() (#12604)
PaperMC/Paper@29fc8532 Allow empty paths in namespaced keys (#12687)
PaperMC/Paper@4419afb9 fix: Safely handle nanosecond overflow in ClickCallback (#12686)
PaperMC/Paper@56528821 Add `isProxyEnabled` method to ServerConfiguration (#12664)
PaperMC/Paper@c0dda0ea Add `isForceDefaultGameMode` method (#12673)
PaperMC/Paper@e714de63 Fix excess slot updates
PaperMC/Paper@6d0821d2 [ci/skip] Fix docs for Spawner class and cleanup (#12710)
PaperMC/Paper@cceffe3d Release ItemType and BlockType (#12708)
PaperMC/Paper@186e9e33 Relocate CommandMap#registerServerAliases() call to after lifecycle events have been run (#12601)
PaperMC/Paper@5edcf6dd Cleanup/command dispatching (#12713)
Purpur Changes:
PurpurMC/Purpur@baa196f5 Updated Upstream (Paper)
PurpurMC/Purpur@fdd1e980 Updated Upstream (Paper)
PurpurMC/Purpur@439f15db Updated Upstream (Paper)
PurpurMC/Purpur@46a28b93 [ci/skip] update version in README
PurpurMC/Purpur@162bd288 Updated Upstream (Paper)
PurpurMC/Purpur@afcdf9bb Updated Upstream (Paper)
* fix random tick order
Signed-off-by: hayanesuru <hayanesuru@outlook.jp>
* update optimize random tick
* fix mob spawning over limit
* optimize mob spawning
* fix FastBitRadixSort memory leak
* optimize brain collections
* [ci/skip] update comments
* Revert "fix FastBitRadixSort memory leak"
This reverts commit bdea683525.
* optimize brain collections
* fix async mob spawning data race
* [ci/skip] cleanup
* remove hash lookup in optimize random tick
* Updated Upstream (Paper/Purpur)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@803baf0b Support hidden entities in Waypoints (#12715)
PaperMC/Paper@1814d8b4 build: publish to fill (#12717)
PaperMC/Paper@e454fef4 Add support for private constructors in plugin main classes (#12652)
PaperMC/Paper@d0e808f4 Move player to correct position in vehicle move packet handler
PaperMC/Paper@46b4b0b8 Improve keepalive ping system
PaperMC/Paper@38c1ddb5 Add and use FeatureHooks.getAllEntities
PaperMC/Paper@2f083acb Ensure player entity schedulers are ticked when they are dead
PaperMC/Paper@7c90c7c4 Optimise EntityScheduler ticking
PaperMC/Paper@aa6ee44a Re-add global region scheduler tick erroneously removed in last commit
PaperMC/Paper@d7510efc Fix #12722 (#12726)
PaperMC/Paper@0caf75f8 Fix #12721 (#12725)
PaperMC/Paper@bee28792 Adventure 4.23.0 (#12690)
PaperMC/Paper@692e93a9 Fix MC-299110
PaperMC/Paper@ea10fa4a Don't mutate the position of Items for MC-4 Fix (#12702)
PaperMC/Paper@aa6cd74c Remove unnecesary item check for ServerboundPlayerActionPacket RELEASE_USE_ITEM (#12668)
PaperMC/Paper@c9e89f49 Expose arrow velocity in EntityShootBowEvent for mobs (#12688)
PaperMC/Paper@7ec3174a Jump out of experimental phase
PaperMC/Paper@4e1a2555 Update try catch for command handling
PaperMC/Paper@e382e687 Fix 0 yield on explosion events
PaperMC/Paper@35b2c6ec Use dropped item for stats info (#12747)
PaperMC/Paper@bd79e20c [ci/skip] PluginManager#getPlugin and PluginManager#isPluginEnabled are case-insensitive (#12723)
Purpur Changes:
PurpurMC/Purpur@4a5974cf Updated Upstream (Paper)
PurpurMC/Purpur@3893bba0 this is important...
PurpurMC/Purpur@47e758fb Updated Upstream (Paper)
* Update PWT patch
* cleanup
* fix playermobcaps command
* fix Didn't fill chunk buffer in async chunk sending
* cleanup
* fix HurtByTargetGoal npe
* optimize collectSpawningChunks (#382)
* optimize collectSpawningChunks
* add bit set
* cleanup
* cleanup
* cleanup
* cleanup
* Updated Upstream (Paper/Purpur)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@57c202e0 Allow adventure nbt codec to parse all tags
Purpur Changes:
PurpurMC/Purpur@a4776d7b Updated Upstream (Paper)
PurpurMC/Purpur@dfd8a7ad Fix phantom going at high speed when ridden (#1680)
* Fix diff
---------
Signed-off-by: hayanesuru <hayanesuru@outlook.jp>
Co-authored-by: hayanesuru <hayanesuru@outlook.jp>
234 lines
9.6 KiB
Diff
234 lines
9.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Kevin Raneri <kevin.raneri@gmail.com>
|
|
Date: Tue, 9 Nov 2021 14:01:56 -0500
|
|
Subject: [PATCH] Pufferfish: Sentry
|
|
|
|
Original license: GPL v3
|
|
Original project: https://github.com/pufferfish-gg/Pufferfish
|
|
|
|
diff --git a/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java b/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..c7772aac00f6db664f7a5673bc2585fa025e6aad
|
|
--- /dev/null
|
|
+++ b/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java
|
|
@@ -0,0 +1,165 @@
|
|
+package gg.pufferfish.pufferfish.sentry;
|
|
+
|
|
+import com.google.gson.Gson;
|
|
+
|
|
+import java.lang.reflect.Field;
|
|
+import java.lang.reflect.Modifier;
|
|
+import java.util.Map;
|
|
+import java.util.TreeMap;
|
|
+
|
|
+import org.apache.logging.log4j.ThreadContext;
|
|
+import org.bukkit.command.Command;
|
|
+import org.bukkit.command.CommandSender;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.Event;
|
|
+import org.bukkit.event.player.PlayerEvent;
|
|
+import org.bukkit.plugin.Plugin;
|
|
+import org.bukkit.plugin.RegisteredListener;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
+public class SentryContext {
|
|
+
|
|
+ private static final Gson GSON = new Gson();
|
|
+
|
|
+ public static void setPluginContext(@Nullable Plugin plugin) {
|
|
+ if (plugin != null) {
|
|
+ ThreadContext.put("pufferfishsentry_pluginname", plugin.getName());
|
|
+ ThreadContext.put("pufferfishsentry_pluginversion", plugin.getPluginMeta().getVersion());
|
|
+ }
|
|
+ }
|
|
+
|
|
+ public static void removePluginContext() {
|
|
+ ThreadContext.remove("pufferfishsentry_pluginname");
|
|
+ ThreadContext.remove("pufferfishsentry_pluginversion");
|
|
+ }
|
|
+
|
|
+ public static void setSenderContext(@Nullable CommandSender sender) {
|
|
+ if (sender != null) {
|
|
+ ThreadContext.put("pufferfishsentry_playername", sender.getName());
|
|
+ if (sender instanceof Player player) {
|
|
+ ThreadContext.put("pufferfishsentry_playerid", player.getUniqueId().toString());
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ public static void removeSenderContext() {
|
|
+ ThreadContext.remove("pufferfishsentry_playername");
|
|
+ ThreadContext.remove("pufferfishsentry_playerid");
|
|
+ }
|
|
+
|
|
+ public static void setEventContext(Event event, RegisteredListener registration) {
|
|
+ setPluginContext(registration.getPlugin());
|
|
+
|
|
+ try {
|
|
+ // Find the player that was involved with this event
|
|
+ Player player = null;
|
|
+ if (event instanceof PlayerEvent) {
|
|
+ player = ((PlayerEvent) event).getPlayer();
|
|
+ } else {
|
|
+ Class<? extends Event> eventClass = event.getClass();
|
|
+
|
|
+ Field playerField = null;
|
|
+
|
|
+ for (Field field : eventClass.getDeclaredFields()) {
|
|
+ if (field.getType().equals(Player.class)) {
|
|
+ playerField = field;
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (playerField != null) {
|
|
+ playerField.setAccessible(true);
|
|
+ player = (Player) playerField.get(event);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (player != null) {
|
|
+ setSenderContext(player);
|
|
+ }
|
|
+ } catch (Exception ignored) {
|
|
+ } // We can't really safely log exceptions.
|
|
+
|
|
+ ThreadContext.put("pufferfishsentry_eventdata", GSON.toJson(serializeFields(event)));
|
|
+ }
|
|
+
|
|
+ public static void removeEventContext() {
|
|
+ removePluginContext();
|
|
+ removeSenderContext();
|
|
+ ThreadContext.remove("pufferfishsentry_eventdata");
|
|
+ }
|
|
+
|
|
+ private static Map<String, String> serializeFields(Object object) {
|
|
+ Map<String, String> fields = new TreeMap<>();
|
|
+ fields.put("_class", object.getClass().getName());
|
|
+ for (Field declaredField : object.getClass().getDeclaredFields()) {
|
|
+ try {
|
|
+ if (Modifier.isStatic(declaredField.getModifiers())) {
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ String fieldName = declaredField.getName();
|
|
+ if (fieldName.equals("handlers")) {
|
|
+ continue;
|
|
+ }
|
|
+ declaredField.setAccessible(true);
|
|
+ Object value = declaredField.get(object);
|
|
+ if (value != null) {
|
|
+ fields.put(fieldName, value.toString());
|
|
+ } else {
|
|
+ fields.put(fieldName, "<null>");
|
|
+ }
|
|
+ } catch (Exception ignored) {
|
|
+ } // We can't really safely log exceptions.
|
|
+ }
|
|
+ return fields;
|
|
+ }
|
|
+
|
|
+ public static class State {
|
|
+
|
|
+ private Plugin plugin;
|
|
+ private Command command;
|
|
+ private String commandLine;
|
|
+ private Event event;
|
|
+ private RegisteredListener registeredListener;
|
|
+
|
|
+ public Plugin getPlugin() {
|
|
+ return plugin;
|
|
+ }
|
|
+
|
|
+ public void setPlugin(Plugin plugin) {
|
|
+ this.plugin = plugin;
|
|
+ }
|
|
+
|
|
+ public Command getCommand() {
|
|
+ return command;
|
|
+ }
|
|
+
|
|
+ public void setCommand(Command command) {
|
|
+ this.command = command;
|
|
+ }
|
|
+
|
|
+ public String getCommandLine() {
|
|
+ return commandLine;
|
|
+ }
|
|
+
|
|
+ public void setCommandLine(String commandLine) {
|
|
+ this.commandLine = commandLine;
|
|
+ }
|
|
+
|
|
+ public Event getEvent() {
|
|
+ return event;
|
|
+ }
|
|
+
|
|
+ public void setEvent(Event event) {
|
|
+ this.event = event;
|
|
+ }
|
|
+
|
|
+ public RegisteredListener getRegisteredListener() {
|
|
+ return registeredListener;
|
|
+ }
|
|
+
|
|
+ public void setRegisteredListener(RegisteredListener registeredListener) {
|
|
+ this.registeredListener = registeredListener;
|
|
+ }
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
|
index dfc2d76403993640e6283f25f9f3647bb6d1a30c..cc07a76545aefbf9eb0915025c89770298be2c1c 100644
|
|
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
|
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
|
@@ -597,7 +597,9 @@ public final class SimplePluginManager implements PluginManager {
|
|
|
|
// Paper start
|
|
private void handlePluginException(String msg, Throwable ex, Plugin plugin) {
|
|
+ gg.pufferfish.pufferfish.sentry.SentryContext.setPluginContext(plugin); // Pufferfish
|
|
server.getLogger().log(Level.SEVERE, msg, ex);
|
|
+ gg.pufferfish.pufferfish.sentry.SentryContext.removePluginContext(); // Pufferfish
|
|
callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerPluginEnableDisableException(msg, ex, plugin)));
|
|
}
|
|
// Paper end
|
|
@@ -667,9 +669,11 @@ public final class SimplePluginManager implements PluginManager {
|
|
));
|
|
}
|
|
} catch (Throwable ex) {
|
|
+ gg.pufferfish.pufferfish.sentry.SentryContext.setEventContext(event, registration); // Pufferfish
|
|
// Paper start - error reporting
|
|
String msg = "Could not pass event " + event.getEventName() + " to " + registration.getPlugin().getDescription().getFullName();
|
|
server.getLogger().log(Level.SEVERE, msg, ex);
|
|
+ gg.pufferfish.pufferfish.sentry.SentryContext.removeEventContext(); // Pufferfish
|
|
if (!(event instanceof com.destroystokyo.paper.event.server.ServerExceptionEvent)) { // We don't want to cause an endless event loop
|
|
callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerEventException(msg, ex, registration.getPlugin(), registration.getListener(), event)));
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
|
index 539786355ac89b5eb8ad876e65662e844d4654e3..ce45dbc7b02c405f1b3460563cf87e7888702ba9 100644
|
|
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
|
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
|
@@ -336,7 +336,13 @@ public final class JavaPluginLoader implements PluginLoader {
|
|
try {
|
|
jPlugin.setEnabled(true);
|
|
} catch (Throwable ex) {
|
|
+ gg.pufferfish.pufferfish.sentry.SentryContext.setPluginContext(plugin); // Pufferfish
|
|
server.getLogger().log(Level.SEVERE, "Error occurred while enabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
|
|
+ gg.pufferfish.pufferfish.sentry.SentryContext.removePluginContext(); // Pufferfish
|
|
+ // Paper start - Disable plugins that fail to load
|
|
+ this.server.getPluginManager().disablePlugin(jPlugin);
|
|
+ return;
|
|
+ // Paper end
|
|
}
|
|
|
|
// Perhaps abort here, rather than continue going, but as it stands,
|
|
@@ -361,7 +367,9 @@ public final class JavaPluginLoader implements PluginLoader {
|
|
try {
|
|
jPlugin.setEnabled(false);
|
|
} catch (Throwable ex) {
|
|
+ gg.pufferfish.pufferfish.sentry.SentryContext.setPluginContext(plugin); // Pufferfish
|
|
server.getLogger().log(Level.SEVERE, "Error occurred while disabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
|
|
+ gg.pufferfish.pufferfish.sentry.SentryContext.removePluginContext(); // Pufferfish
|
|
}
|
|
|
|
if (cloader instanceof PluginClassLoader) {
|