Merge pull request #339 from VolmitSoftware/Development

sQ

Author: NextdoorPsycho

src/main/java/com/volmit/adapt/content/adaptation/hunter/HunterInvis.java

@@ -69,14 +69,13 @@ public void on(EntityDamageEvent e) {
                     addPotionStacks(p, PotionEffectType.POISON, 2 + getLevel(p), 300, true);
 
                 } else {
-
                     addPotionStacks(p, PotionEffectType.HUNGER, 5 + getLevel(p), 100, true);
                     addPotionStacks(p, PotionEffectType.INVISIBILITY, 1, 50 * getLevel(p), true);
                 }
             } else {
                 if (getConfig().consumable != null && Material.getMaterial(getConfig().consumable) != null) {
                     Material mat = Material.getMaterial(getConfig().consumable);
-                    if (p.getInventory().contains(mat)) {
+                    if (mat != null && p.getInventory().contains(mat)) {
                         p.getInventory().removeItem(new ItemStack(mat, 1));
                         addPotionStacks(p, PotionEffectType.INVISIBILITY, getLevel(p), 50, false);
                     } else {

src/main/java/com/volmit/adapt/content/adaptation/hunter/HunterJumpBoost.java

@@ -73,7 +73,7 @@ public void on(EntityDamageEvent e) {
             } else {
                 if (getConfig().consumable != null && Material.getMaterial(getConfig().consumable) != null) {
                     Material mat = Material.getMaterial(getConfig().consumable);
-                    if (p.getInventory().contains(mat)) {
+                    if (mat != null && p.getInventory().contains(mat)) {
                         p.getInventory().removeItem(new ItemStack(mat, 1));
                         addPotionStacks(p, PotionEffectType.JUMP, getLevel(p), 50, false);
                     } else {

src/main/java/com/volmit/adapt/content/adaptation/hunter/HunterLuck.java

@@ -74,7 +74,7 @@ public void on(EntityDamageEvent e) {
             } else {
                 if (getConfig().consumable != null && Material.getMaterial(getConfig().consumable) != null) {
                     Material mat = Material.getMaterial(getConfig().consumable);
-                    if (p.getInventory().contains(mat)) {
+                    if (mat != null &&p.getInventory().contains(mat)) {
                         p.getInventory().removeItem(new ItemStack(mat, 1));
                         addPotionStacks(p, PotionEffectType.LUCK, getLevel(p), 50, false);
                     } else {

src/main/java/com/volmit/adapt/content/adaptation/hunter/HunterRegen.java

@@ -73,7 +73,7 @@ public void on(EntityDamageEvent e) {
             } else {
                 if (getConfig().consumable != null && Material.getMaterial(getConfig().consumable) != null) {
                     Material mat = Material.getMaterial(getConfig().consumable);
-                    if (p.getInventory().contains(mat)) {
+                    if (mat != null &&p.getInventory().contains(mat)) {
                         p.getInventory().removeItem(new ItemStack(mat, 1));
                         addPotionStacks(p, PotionEffectType.REGENERATION, getLevel(p), 5 + getLevel(p), false);
                     } else {

src/main/java/com/volmit/adapt/content/adaptation/hunter/HunterResistance.java

@@ -58,6 +58,7 @@ public void addStats(int level, Element v) {
 
     @EventHandler(priority = EventPriority.HIGHEST)
     public void on(EntityDamageEvent e) {
+
         if (e.isCancelled()) {
             return;
         }
@@ -74,7 +75,7 @@ public void on(EntityDamageEvent e) {
             } else {
                 if (getConfig().consumable != null && Material.getMaterial(getConfig().consumable) != null) {
                     Material mat = Material.getMaterial(getConfig().consumable);
-                    if (p.getInventory().contains(mat)) {
+                    if (mat != null &&p.getInventory().contains(mat)) {
                         p.getInventory().removeItem(new ItemStack(mat, 1));
                         addPotionStacks(p, PotionEffectType.DAMAGE_RESISTANCE, getLevel(p), 50, false);
                     } else {

src/main/java/com/volmit/adapt/content/adaptation/hunter/HunterSpeed.java

@@ -73,7 +73,7 @@ public void on(EntityDamageEvent e) {
             } else {
                 if (getConfig().consumable != null && Material.getMaterial(getConfig().consumable) != null) {
                     Material mat = Material.getMaterial(getConfig().consumable);
-                    if (p.getInventory().contains(mat)) {
+                    if (mat != null &&p.getInventory().contains(mat)) {
                         p.getInventory().removeItem(new ItemStack(mat, 1));
                         addPotionStacks(p, PotionEffectType.SPEED, getLevel(p), 50, false);
                     } else {

src/main/java/com/volmit/adapt/content/adaptation/hunter/HunterStrength.java

@@ -72,7 +72,7 @@ public void on(EntityDamageEvent e) {
             } else {
                 if (getConfig().consumable != null && Material.getMaterial(getConfig().consumable) != null) {
                     Material mat = Material.getMaterial(getConfig().consumable);
-                    if (p.getInventory().contains(mat)) {
+                    if (mat != null &&p.getInventory().contains(mat)) {
                         p.getInventory().removeItem(new ItemStack(mat, 1));
                         addPotionStacks(p, PotionEffectType.INCREASE_DAMAGE, getLevel(p), 50, false);
                     } else {

src/main/java/com/volmit/adapt/content/adaptation/nether/NetherSkullYeet.java

@@ -32,6 +32,7 @@
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.WitherSkull;
+import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
@@ -81,7 +82,7 @@ public void onRightClick(PlayerInteractEvent e) {
         if (!hasAdaptation(e.getPlayer())) {
             return;
         }
-        if (e.isCancelled()) {
+        if (e.useItemInHand() == Event.Result.DENY) {
             return;
         }
 

src/main/java/com/volmit/adapt/content/adaptation/rift/RiftAccess.java

@@ -28,6 +28,7 @@
 import com.volmit.adapt.util.J;
 import com.volmit.adapt.util.Localizer;
 import lombok.NoArgsConstructor;
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.Particle;
 import org.bukkit.Sound;
@@ -145,13 +146,13 @@ private void openPearl(Player p) {
             return;
         }
         loadChunkAsync(b.getLocation(), chunk -> {
-            if (AdvancedChestsAPI.getChestManager().getAdvancedChest(b.getLocation()) != null) {
+            if (Bukkit.getPluginManager().isPluginEnabled("AdvancedChests") &&
+                    AdvancedChestsAPI.getChestManager().getAdvancedChest(b.getLocation()) != null) {
                 AdvancedChestsAPI.getChestManager().getAdvancedChest(b.getLocation()).openPage(p, 1);
+                Adapt.verbose("Opening AdvancedChests GUI");
                 p.playSound(p.getLocation(), Sound.PARTICLE_SOUL_ESCAPE, 1f, 0.10f);
                 p.playSound(p.getLocation(), Sound.BLOCK_ENDER_CHEST_OPEN, 1f, 0.10f);
-                return;
-            }
-            if (b.getState() instanceof InventoryHolder holder) {
+            } else if (b.getState() instanceof InventoryHolder holder) {
                 activeViews.add(p.openInventory(holder.getInventory()));
                 p.playSound(p.getLocation(), Sound.PARTICLE_SOUL_ESCAPE, 1f, 0.10f);
                 p.playSound(p.getLocation(), Sound.BLOCK_ENDER_CHEST_OPEN, 1f, 0.10f);