mirror of
https://github.com/PaperMC/Folia.git
synced 2024-10-03 05:17:36 +02:00
76b06a1260
The code to stop all brain tasks is required to pass the current game time to the tasks it stops. But, when a villager is being portalled, the copied entity does not have any running tasks. So, we can simply return early before invoking getGameTime if there are no running tasks. Fixes https://github.com/PaperMC/Folia/issues/23
83 lines
4.6 KiB
Diff
83 lines
4.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
|
|
Date: Wed, 29 Mar 2023 16:50:14 -0400
|
|
Subject: [PATCH] Require plugins to be explicitly marked as Folia supported
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/plugin/provider/configuration/PaperPluginMeta.java b/src/main/java/io/papermc/paper/plugin/provider/configuration/PaperPluginMeta.java
|
|
index 7605efe37ac4a63cb95c8c64c576e93c0e676cc0..bf4da696710026febea85ffcc559621d1ea33e45 100644
|
|
--- a/src/main/java/io/papermc/paper/plugin/provider/configuration/PaperPluginMeta.java
|
|
+++ b/src/main/java/io/papermc/paper/plugin/provider/configuration/PaperPluginMeta.java
|
|
@@ -62,6 +62,7 @@ public class PaperPluginMeta implements PluginMeta {
|
|
@Required
|
|
@PluginConfigConstraints.PluginVersion
|
|
private String apiVersion;
|
|
+ private boolean foliaSupported = false; // Folia
|
|
|
|
private transient String displayName;
|
|
|
|
@@ -204,6 +205,13 @@ public class PaperPluginMeta implements PluginMeta {
|
|
return this.apiVersion;
|
|
}
|
|
|
|
+ // Folia start
|
|
+ @Override
|
|
+ public boolean isFoliaSupported() {
|
|
+ return this.foliaSupported;
|
|
+ }
|
|
+ // Folia end
|
|
+
|
|
@Override
|
|
public @NotNull List<String> getProvidedPlugins() {
|
|
return this.provides;
|
|
diff --git a/src/main/java/io/papermc/paper/plugin/provider/type/paper/PaperPluginProviderFactory.java b/src/main/java/io/papermc/paper/plugin/provider/type/paper/PaperPluginProviderFactory.java
|
|
index 1ba051931d3ce6ac0bef559911e4453044266aab..dc81e1a9faa54ba677bede6d7ca2414b1d7b6003 100644
|
|
--- a/src/main/java/io/papermc/paper/plugin/provider/type/paper/PaperPluginProviderFactory.java
|
|
+++ b/src/main/java/io/papermc/paper/plugin/provider/type/paper/PaperPluginProviderFactory.java
|
|
@@ -24,6 +24,11 @@ class PaperPluginProviderFactory implements PluginTypeFactory<PaperPluginParent,
|
|
|
|
@Override
|
|
public PaperPluginParent build(JarFile file, PaperPluginMeta configuration, Path source) throws Exception {
|
|
+ // Folia start - block plugins not marked as supported
|
|
+ if (!configuration.isFoliaSupported()) {
|
|
+ throw new RuntimeException("Could not load plugin '" + configuration.getDisplayName() + "' as it is not marked as supporting Folia!");
|
|
+ }
|
|
+ // Folia end - block plugins not marked as supported
|
|
Logger jul = PaperPluginLogger.getLogger(configuration);
|
|
ComponentLogger logger = ComponentLogger.logger(jul.getName());
|
|
PluginProviderContext context = PluginProviderContextImpl.of(configuration, logger, source);
|
|
diff --git a/src/main/java/io/papermc/paper/plugin/provider/type/spigot/SpigotPluginProviderFactory.java b/src/main/java/io/papermc/paper/plugin/provider/type/spigot/SpigotPluginProviderFactory.java
|
|
index 14ed05945ba5bfeb2b539d4786278b0e04130404..ad13d60eeb94a75c97b3d0696c39d834d6082bfa 100644
|
|
--- a/src/main/java/io/papermc/paper/plugin/provider/type/spigot/SpigotPluginProviderFactory.java
|
|
+++ b/src/main/java/io/papermc/paper/plugin/provider/type/spigot/SpigotPluginProviderFactory.java
|
|
@@ -17,6 +17,11 @@ class SpigotPluginProviderFactory implements PluginTypeFactory<SpigotPluginProvi
|
|
|
|
@Override
|
|
public SpigotPluginProvider build(JarFile file, PluginDescriptionFile configuration, Path source) throws Exception {
|
|
+ // Folia start - block plugins not marked as supported
|
|
+ if (!configuration.isFoliaSupported()) {
|
|
+ throw new RuntimeException("Could not load plugin '" + configuration.getDisplayName() + "' as it is not marked as supporting Folia!");
|
|
+ }
|
|
+ // Folia end - block plugins not marked as supported
|
|
// Copied from SimplePluginManager#loadPlugins
|
|
// Spigot doesn't validate the name when the config is created, and instead when the plugin is loaded.
|
|
// Paper plugin configuration will do these checks in config serializer instead of when this is created.
|
|
diff --git a/src/test/java/io/papermc/paper/plugin/TestPluginMeta.java b/src/test/java/io/papermc/paper/plugin/TestPluginMeta.java
|
|
index ba271c35eb2804f94cfc893bf94affb9ae13d3ba..db9285c2ff0c805f5d9564b6e8520c33ea5bb65a 100644
|
|
--- a/src/test/java/io/papermc/paper/plugin/TestPluginMeta.java
|
|
+++ b/src/test/java/io/papermc/paper/plugin/TestPluginMeta.java
|
|
@@ -20,6 +20,13 @@ public class TestPluginMeta implements PluginMeta {
|
|
this.identifier = identifier;
|
|
}
|
|
|
|
+ // Folia start - region threading
|
|
+ @Override
|
|
+ public boolean isFoliaSupported() {
|
|
+ return true;
|
|
+ }
|
|
+ // Folia end - region threading
|
|
+
|
|
@Override
|
|
public @NotNull String getName() {
|
|
return this.identifier;
|