Ensure thread safety for unloading

APickledWalrus · May 26, 2024 · 0b8afb7 · 0b8afb7
1 parent 539f152
commit 0b8afb7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) Patrick Miller
+Copyright (c) 2024 Patrick Miller
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/.../io/github/apickledwalrus/skriptplaceholders/skript/elements/StructCustomPlaceholder.java b/.../io/github/apickledwalrus/skriptplaceholders/skript/elements/StructCustomPlaceholder.java
@@ -122,17 +122,24 @@ public boolean load() {
 		if (Bukkit.isPrimaryThread()) {
 			registry.registerPlaceholder(plugin, placeholder, this);
 		} else {
-			Bukkit.getScheduler().runTask(SkriptPlaceholders.getInstance(), () -> {
-				registry.registerPlaceholder(plugin, placeholder, this);
-			});
+			Bukkit.getScheduler().runTask(SkriptPlaceholders.getInstance(),
+					() -> registry.registerPlaceholder(plugin, placeholder, this)
+			);
 		}
 
 		return true;
 	}
 
 	@Override
 	public void unload() {
-		registry.unregisterPlaceholder(plugin, placeholder, this);
+		// to be safe, ensure unregistering is done on the main thread too
+		if (Bukkit.isPrimaryThread()) {
+			registry.unregisterPlaceholder(plugin, placeholder, this);
+		} else {
+			Bukkit.getScheduler().runTask(SkriptPlaceholders.getInstance(),
+					() -> registry.unregisterPlaceholder(plugin, placeholder, this)
+			);
+		}
 	}
 
 	@Override