fix orb of origins not clearing powers

Dueris · Jun 2, 2024 · 0893709 · 0893709
1 parent 4d6a304
commit 0893709
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/origins/src/main/java/me/dueris/genesismc/factory/powers/holder/PowerType.java b/origins/src/main/java/me/dueris/genesismc/factory/powers/holder/PowerType.java
@@ -135,8 +135,8 @@ public void forPlayer(Player player) {
 	}
 
 	public void removePlayer(Player player) {
-		this.hasPlayers = false;
 		this.players.remove((CraftPlayer) player);
+		this.hasPlayers = !this.players.isEmpty();
 	}
 
 	public boolean isActive(Player player) {

diff --git a/origins/src/main/java/me/dueris/genesismc/screen/ScreenNavigator.java b/origins/src/main/java/me/dueris/genesismc/screen/ScreenNavigator.java
@@ -2,6 +2,7 @@
 
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
+import javassist.NotFoundException;
 import me.dueris.genesismc.GenesisMC;
 import me.dueris.genesismc.content.OrbOfOrigins;
 import me.dueris.genesismc.event.OrbInteractEvent;
@@ -170,9 +171,14 @@ public void onOrbClick(PlayerInteractEvent e) {
 						if (!((CraftPlayer) p).getHandle().getAbilities().instabuild) {
 							Util.consumeItem(e.getItem());
 						}
-						for (Layer layer : CraftApoli.getLayersFromRegistry()) {
+						CraftApoli.getLayersFromRegistry().forEach(layer -> {
+							try {
+								PowerHolderComponent.unassignPowers(p, layer);
+							} catch (NotFoundException ee) {
+								throw new RuntimeException(ee);
+							}
 							PowerHolderComponent.setOrigin(p, layer, CraftApoli.emptyOrigin());
-						}
+						});
 						OrbInteractEvent event = new OrbInteractEvent(p);
 						getServer().getPluginManager().callEvent(event);
 					}