Cleanup

Dueris · May 26, 2024 · d5ea1f2 · d5ea1f2
1 parent 660064c
commit d5ea1f2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 21 deletions.
diff --git a/origins/src/main/java/me/dueris/genesismc/factory/actions/types/EntityActions.java b/origins/src/main/java/me/dueris/genesismc/factory/actions/types/EntityActions.java
@@ -486,7 +486,7 @@ public void register() {
 		}));
 		register(new ActionFactory(GenesisMC.apoliIdentifier("apply_effect"), (action, entity) -> {
 			if (entity instanceof LivingEntity le) {
-				Util.parseAndReturnPotionEffects(action).forEach(potionEffect -> le.addPotionEffect(potionEffect, true));
+				Util.parseAndReturnPotionEffects(action).forEach(potionEffect -> le.addPotionEffect(potionEffect));
 			}
 		}));
 		register(new ActionFactory(GenesisMC.apoliIdentifier("area_of_effect"), (action, entity) -> {

diff --git a/origins/src/main/java/me/dueris/genesismc/util/KeybindUtil.java b/origins/src/main/java/me/dueris/genesismc/util/KeybindUtil.java
@@ -221,26 +221,14 @@ public void onTransfer(InventoryClickEvent e) {
 
 			return;
 		}
-		if (e.getView().getTopInventory().getType() != InventoryType.CRAFTING) {
-			if (e.getView().getTopInventory().getHolder() != null && e.getView().getTopInventory().getHolder().equals(e.getWhoClicked()))
-				return;
-			if (e.getCurrentItem() == null) return;
-			if (e.getCurrentItem().isSimilar(getPrimaryTrigger((Player) e.getWhoClicked()))) {
-				e.setCancelled(true);
-			}
-			if (e.getCurrentItem().isSimilar(getSecondaryTrigger((Player) e.getWhoClicked()))) {
-				e.setCancelled(true);
-			}
-		} else {
-			if (e.getView().getTopInventory().getHolder() != null && e.getView().getTopInventory().getHolder().equals(e.getWhoClicked()))
-				return;
-			if (e.getCurrentItem() == null) return;
-			if (e.getCurrentItem().isSimilar(getPrimaryTrigger((Player) e.getWhoClicked()))) {
-				e.setCancelled(true);
-			}
-			if (e.getCurrentItem().isSimilar(getSecondaryTrigger((Player) e.getWhoClicked()))) {
-				e.setCancelled(true);
-			}
+		if (e.getView().getTopInventory().getHolder() != null && e.getView().getTopInventory().getHolder().equals(e.getWhoClicked()))
+			return;
+		if (e.getCurrentItem() == null) return;
+		if (e.getCurrentItem().isSimilar(getPrimaryTrigger((Player) e.getWhoClicked()))) {
+			e.setCancelled(true);
+		}
+		if (e.getCurrentItem().isSimilar(getSecondaryTrigger((Player) e.getWhoClicked()))) {
+			e.setCancelled(true);
 		}
 	}