Merge pull request #137 from VolmitSoftware/Development

NextdoorPsycho · web-flow · commit ae9f829b144b · 2022-09-11T11:07:17.000-07:00
Development
diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ plugins {
 }
 
 
-version '1.0.13-1.19.2' // Needs to be version specific
+version '1.1.1-1.19.2' // Needs to be version specific
 def nmsVersion = "1.19.2" //[NMS]
 def apiVersion = '1.19'
 def specialSourceVersion = '1.11.0' //[NMS]
diff --git a/src/main/java/com/volmit/adapt/api/Component.java b/src/main/java/com/volmit/adapt/api/Component.java
@@ -438,8 +438,8 @@ default List<Location> vfxSelectionCube(Location corner1, Location corner2, doub
 
     default void riftResistCheckAndTrigger(Player p, int duration, int amplifier) {
         p.getWorld().playSound(p.getLocation(), Sound.ITEM_ARMOR_EQUIP_IRON, 1f, 1.24f);
-        p.getLocation().getWorld().playSound(p.getLocation(), Sound.BLOCK_CONDUIT_AMBIENT_SHORT, 1000f, 0.01f);
-        p.getLocation().getWorld().playSound(p.getLocation(), Sound.BLOCK_RESPAWN_ANCHOR_CHARGE, 1000f, 0.01f);
+        p.getLocation().getWorld().playSound(p.getLocation(), Sound.BLOCK_CONDUIT_AMBIENT_SHORT, 1f, 0.01f);
+        p.getLocation().getWorld().playSound(p.getLocation(), Sound.BLOCK_RESPAWN_ANCHOR_CHARGE, 1f, 0.01f);
         p.addPotionEffect(new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, duration, amplifier, true, false, false));
     }
 
diff --git a/src/main/java/com/volmit/adapt/content/adaptation/architect/ArchitectFoundation.java b/src/main/java/com/volmit/adapt/content/adaptation/architect/ArchitectFoundation.java
@@ -130,8 +130,8 @@ public void on(PlayerToggleSneakEvent e) {
         } else if (!e.isSneaking() && active) {
             this.active.remove(e.getPlayer());
             cooldowns.put(e.getPlayer(), M.ms() + getConfig().cooldown);
-            e.getPlayer().getWorld().playSound(e.getPlayer().getLocation(), Sound.BLOCK_BEACON_DEACTIVATE, 100.0f, 10.0f);
-            e.getPlayer().getWorld().playSound(e.getPlayer().getLocation(), Sound.BLOCK_SCULK_CATALYST_BREAK, 100.0f, 0.81f);
+            e.getPlayer().getWorld().playSound(e.getPlayer().getLocation(), Sound.BLOCK_BEACON_DEACTIVATE, 1.0f, 10.0f);
+            e.getPlayer().getWorld().playSound(e.getPlayer().getLocation(), Sound.BLOCK_SCULK_CATALYST_BREAK, 1.0f, 0.81f);
         }
     }
 
diff --git a/src/main/java/com/volmit/adapt/content/adaptation/ranged/RangedArrowRecovery.java b/src/main/java/com/volmit/adapt/content/adaptation/ranged/RangedArrowRecovery.java
@@ -30,6 +30,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.inventory.ItemStack;
@@ -96,7 +97,7 @@ public void on(EntityDamageByEntityEvent e) {
         }
     }
 
-    @EventHandler
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(EntityDeathEvent e) {
         Integer c = arrows.remove(e.getEntity().getUniqueId());
 
diff --git a/src/main/java/com/volmit/adapt/content/adaptation/rift/RiftAccess.java b/src/main/java/com/volmit/adapt/content/adaptation/rift/RiftAccess.java
@@ -148,8 +148,8 @@ private void openPearl(Player p) {
             activeViews.add(p.openInventory(holder.getInventory()));
             if (getConfig().showParticles) {
 
-                p.playSound(p.getLocation(), Sound.PARTICLE_SOUL_ESCAPE, 100f, 0.10f);
-                p.playSound(p.getLocation(), Sound.BLOCK_ENDER_CHEST_OPEN, 100f, 0.10f);
+                p.playSound(p.getLocation(), Sound.PARTICLE_SOUL_ESCAPE, 1f, 0.10f);
+                p.playSound(p.getLocation(), Sound.BLOCK_ENDER_CHEST_OPEN, 1f, 0.10f);
             }
         }
     }
diff --git a/src/main/java/com/volmit/adapt/content/adaptation/rift/RiftGate.java b/src/main/java/com/volmit/adapt/content/adaptation/rift/RiftGate.java
@@ -137,8 +137,8 @@ && getPlayer(p).getData().getSkillLines().get("rift").getAdaptations().get("rift
 
         p.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, 100, 10, true, false, false));
         p.addPotionEffect(new PotionEffect(PotionEffectType.LEVITATION, 85, 0, true, false, false));
-        p.playSound(l, Sound.BLOCK_LODESTONE_PLACE, 100f, 0.1f);
-        p.playSound(l, Sound.BLOCK_BELL_RESONATE, 100f, 0.1f);
+        p.playSound(l, Sound.BLOCK_LODESTONE_PLACE, 1f, 0.1f);
+        p.playSound(l, Sound.BLOCK_BELL_RESONATE, 1f, 0.1f);
         J.a(() -> {
             double d = 2;
             double pcd = 1000;
diff --git a/src/main/java/com/volmit/adapt/content/adaptation/rift/RiftResist.java b/src/main/java/com/volmit/adapt/content/adaptation/rift/RiftResist.java
@@ -54,8 +54,8 @@ static void riftResistStackAdd(Player p, int duration, int amplifier) {
             return;
         }
         p.getWorld().playSound(p.getLocation(), Sound.ITEM_ARMOR_EQUIP_IRON, 1f, 1.24f);
-        p.getLocation().getWorld().playSound(p.getLocation(), Sound.BLOCK_CONDUIT_AMBIENT_SHORT, 1000f, 0.01f);
-        p.getLocation().getWorld().playSound(p.getLocation(), Sound.BLOCK_RESPAWN_ANCHOR_CHARGE, 1000f, 0.01f);
+        p.getLocation().getWorld().playSound(p.getLocation(), Sound.BLOCK_CONDUIT_AMBIENT_SHORT, 1f, 0.01f);
+        p.getLocation().getWorld().playSound(p.getLocation(), Sound.BLOCK_RESPAWN_ANCHOR_CHARGE, 1f, 0.01f);
         p.addPotionEffect(new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, duration, amplifier, true, false, false));
     }
 
diff --git a/src/main/java/com/volmit/adapt/content/adaptation/taming/TamingHealthRegeneration.java b/src/main/java/com/volmit/adapt/content/adaptation/taming/TamingHealthRegeneration.java
@@ -29,6 +29,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Tameable;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDeathEvent;
 import xyz.xenondevs.particle.ParticleEffect;
@@ -70,7 +71,7 @@ public void on(EntityDamageByEntityEvent e) {
         }
     }
 
-    @EventHandler
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(EntityDeathEvent e) {
         lastDamage.remove(e.getEntity().getUniqueId());
     }
diff --git a/src/main/java/com/volmit/adapt/content/skill/SkillAgility.java b/src/main/java/com/volmit/adapt/content/skill/SkillAgility.java
@@ -35,6 +35,7 @@
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerMoveEvent;
 
 public class SkillAgility extends SimpleSkill<SkillAgility.Config> {
@@ -79,7 +80,7 @@ public SkillAgility() {
         registerStatTracker(AdaptStatTracker.builder().advancement("challenge_sprint_marathon").goal(42195).stat("move").reward(getConfig().challengeSprintMarathonReward).build());
     }
 
-    @EventHandler
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(PlayerMoveEvent e) {
         if (!AdaptConfig.get().isXpInCreative() && e.getPlayer().getGameMode().name().contains("CREATIVE")) {
             return;
diff --git a/src/main/java/com/volmit/adapt/content/skill/SkillArchitect.java b/src/main/java/com/volmit/adapt/content/skill/SkillArchitect.java
@@ -35,6 +35,7 @@
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
 
@@ -55,7 +56,7 @@ public SkillArchitect() {
         registerAdaptation(new ArchitectPlacement());
     }
 
-    @EventHandler
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(BlockPlaceEvent e) {
         if (e.isCancelled()) {
             return;
@@ -70,7 +71,7 @@ public void on(BlockPlaceEvent e) {
 
     }
 
-    @EventHandler
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(BlockBreakEvent e) {
         if (e.isCancelled()) {
             return;
diff --git a/src/main/java/com/volmit/adapt/content/skill/SkillAxes.java b/src/main/java/com/volmit/adapt/content/skill/SkillAxes.java
@@ -71,7 +71,7 @@ public void on(EntityDamageByEntityEvent e) {
         }
     }
 
-    @EventHandler
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(BlockBreakEvent e) {
         if (e.isCancelled()) {
             return;
diff --git a/src/main/java/com/volmit/adapt/content/skill/SkillBrewing.java b/src/main/java/com/volmit/adapt/content/skill/SkillBrewing.java
@@ -33,6 +33,7 @@
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.entity.PotionSplashEvent;
@@ -53,7 +54,7 @@ public SkillBrewing() {
         SpatialMatter.registerSliceType(new BrewingStandOwnerMatter());
     }
 
-    @EventHandler
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(PlayerItemConsumeEvent e) {
         if (!AdaptConfig.get().isXpInCreative() && e.getPlayer().getGameMode().name().contains("CREATIVE")) {
             return;
@@ -71,7 +72,7 @@ public void on(PlayerItemConsumeEvent e) {
         }
     }
 
-    @EventHandler
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(PotionSplashEvent e) {
         if (e.getPotion().getShooter() instanceof Player p) {
             if (!AdaptConfig.get().isXpInCreative() && p.getGameMode().name().contains("CREATIVE")) {
@@ -83,7 +84,7 @@ public void on(PotionSplashEvent e) {
         }
     }
 
-    @EventHandler
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(BlockPlaceEvent e) {
         if (e.isCancelled()) {
             return;
@@ -98,7 +99,7 @@ public void on(BlockPlaceEvent e) {
         }
     }
 
-    @EventHandler
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(BlockBreakEvent e) {
         if (e.isCancelled()) {
             return;
diff --git a/src/main/java/com/volmit/adapt/content/skill/SkillCrafting.java b/src/main/java/com/volmit/adapt/content/skill/SkillCrafting.java
@@ -152,7 +152,7 @@ private int getMaxCraftAmount(CraftingInventory inv) {
         return resultCount * materialCount;
     }
 
-    @EventHandler
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(FurnaceSmeltEvent e) {
         if (e.isCancelled()) {
             return;
diff --git a/src/main/java/com/volmit/adapt/content/skill/SkillDiscovery.java b/src/main/java/com/volmit/adapt/content/skill/SkillDiscovery.java
@@ -62,23 +62,23 @@ public SkillDiscovery() {
         registerAdaptation(new DiscoveryXpResist());
     }
 
-    @EventHandler
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(PlayerChangedWorldEvent e) {
         if (!AdaptConfig.get().isXpInCreative() && e.getPlayer().getGameMode().name().contains("CREATIVE")) {
             return;
         }
         seeWorld(e.getPlayer(), e.getPlayer().getWorld());
     }
 
-    @EventHandler
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(PlayerInteractAtEntityEvent e) {
         if (!AdaptConfig.get().isXpInCreative() && e.getPlayer().getGameMode().name().contains("CREATIVE")) {
             return;
         }
         seeEntity(e.getPlayer(), e.getRightClicked());
     }
 
-    @EventHandler
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(EntityPickupItemEvent e) {
         if (e.getEntity() instanceof Player p) {
             if (!AdaptConfig.get().isXpInCreative() && p.getGameMode().name().contains("CREATIVE")) {
@@ -88,7 +88,7 @@ public void on(EntityPickupItemEvent e) {
         }
     }
 
-    @EventHandler
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(CraftItemEvent e) {
         if (e.isCancelled()) {
             return;
@@ -109,7 +109,7 @@ public void on(CraftItemEvent e) {
         }
     }
 
-    @EventHandler
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(PlayerItemConsumeEvent e) {
         if (e.isCancelled()) {
             return;
@@ -121,7 +121,7 @@ public void on(PlayerItemConsumeEvent e) {
         seeFood(e.getPlayer(), e.getItem().getType());
     }
 
-    @EventHandler
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(PlayerInteractEvent e) {
         if (e.isCancelled()) {
             return;
@@ -134,7 +134,7 @@ public void on(PlayerInteractEvent e) {
         }
     }
 
-    @EventHandler(priority = EventPriority.LOW)
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(PlayerExpChangeEvent e) {
         if (!AdaptConfig.get().isXpInCreative() && e.getPlayer().getGameMode().name().contains("CREATIVE")) {
             return;
diff --git a/src/main/java/com/volmit/adapt/content/skill/SkillEnchanting.java b/src/main/java/com/volmit/adapt/content/skill/SkillEnchanting.java
@@ -28,6 +28,7 @@
 import lombok.NoArgsConstructor;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.enchantment.EnchantItemEvent;
 
 public class SkillEnchanting extends SimpleSkill<SkillEnchanting.Config> {
@@ -44,7 +45,7 @@ public SkillEnchanting() {
         registerAdaptation(new EnchantingXPReturn()); //
     }
 
-    @EventHandler
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(EnchantItemEvent e) {
         if (e.isCancelled()) {
             return;
diff --git a/src/main/java/com/volmit/adapt/content/skill/SkillExcavation.java b/src/main/java/com/volmit/adapt/content/skill/SkillExcavation.java
@@ -31,6 +31,7 @@
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.inventory.ItemStack;
@@ -50,7 +51,7 @@ public SkillExcavation() {
 
     }
 
-    @EventHandler
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(EntityDamageByEntityEvent e) {
         if (!e.isCancelled()) {
             if (e.getDamager() instanceof Player p) {
@@ -68,7 +69,7 @@ public void on(EntityDamageByEntityEvent e) {
         }
     }
 
-    @EventHandler
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(BlockBreakEvent e) {
         if (!e.isCancelled()) {
             if (!AdaptConfig.get().isXpInCreative() && e.getPlayer().getGameMode().name().contains("CREATIVE")) {
diff --git a/src/main/java/com/volmit/adapt/content/skill/SkillHerbalism.java b/src/main/java/com/volmit/adapt/content/skill/SkillHerbalism.java
@@ -97,7 +97,7 @@ public SkillHerbalism() {
         registerStatTracker(AdaptStatTracker.builder().advancement("challenge_harvest_1000").goal(1000).stat("harvest.blocks").reward(getConfig().challengeHarvest1kReward).build());
     }
 
-    @EventHandler
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(PlayerItemConsumeEvent e) {
         if (e.isCancelled()) {
             return;
@@ -112,7 +112,7 @@ public void on(PlayerItemConsumeEvent e) {
         getPlayer(e.getPlayer()).getData().addStat("food.eaten", 1);
     }
 
-    @EventHandler
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(PlayerShearEntityEvent e) {
         if (e.isCancelled()) {
             return;
diff --git a/src/main/java/com/volmit/adapt/content/skill/SkillHunter.java b/src/main/java/com/volmit/adapt/content/skill/SkillHunter.java
@@ -54,7 +54,7 @@ public SkillHunter() {
         registerAdaptation(new HunterDropToInventory());
     }
 
-    @EventHandler
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(BlockBreakEvent e) {
         if (e.isCancelled()) {
             return;
@@ -68,28 +68,30 @@ public void on(BlockBreakEvent e) {
         }
     }
 
-    @EventHandler
+    @EventHandler (priority = EventPriority.HIGHEST)
     public void on(PlayerInteractEvent e) {
 
         if (!AdaptConfig.get().isXpInCreative() && e.getPlayer().getGameMode().name().contains("CREATIVE")) {
             return;
         }
-        if (e.getAction().equals(Action.PHYSICAL) && e.getClickedBlock().getType().equals(Material.TURTLE_EGG)) {
+        if (e.getAction().equals(Action.PHYSICAL) && e.getClickedBlock() != null && e.getClickedBlock().getType().equals(Material.TURTLE_EGG)) {
             xp(e.getClickedBlock().getLocation(), getConfig().turtleEggKillXP, getConfig().turtleEggSpatialRadius, getConfig().turtleEggSpatialDuration);
             getPlayer(e.getPlayer()).getData().addStat("killed.tutleeggs", 1);
         }
     }
 
-    @EventHandler(priority = EventPriority.HIGH)
+    @EventHandler(priority = EventPriority.HIGHEST)
     public void on(EntityDeathEvent e) {
         if (e.getEntity().getKiller() != null) {
             if (!AdaptConfig.get().isXpInCreative() && e.getEntity().getKiller().getGameMode().name().contains("CREATIVE")) {
                 return;
             }
             double cmult = e.getEntity().getType().equals(EntityType.CREEPER) ? getConfig().creeperKillMultiplier : 1;
-            xp(e.getEntity().getLocation(), e.getEntity().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue() * getConfig().killMaxHealthSpatialXPMultiplier * cmult, getConfig().killSpatialRadius, getConfig().killSpatialDuration);
-            xp(e.getEntity().getKiller(), e.getEntity().getLocation(), e.getEntity().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue() * getConfig().killMaxHealthXPMultiplier * cmult);
-            getPlayer(e.getEntity().getKiller()).getData().addStat("killed.kills", 1);
+            if (e.getEntity().getAttribute(Attribute.GENERIC_MAX_HEALTH) != null) {
+                xp(e.getEntity().getLocation(), e.getEntity().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue() * getConfig().killMaxHealthSpatialXPMultiplier * cmult, getConfig().killSpatialRadius, getConfig().killSpatialDuration);
+                xp(e.getEntity().getKiller(), e.getEntity().getLocation(), e.getEntity().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue() * getConfig().killMaxHealthXPMultiplier * cmult);
+                getPlayer(e.getEntity().getKiller()).getData().addStat("killed.kills", 1);
+            }
         }
     }
 
diff --git a/src/main/java/com/volmit/adapt/content/skill/SkillNether.java b/src/main/java/com/volmit/adapt/content/skill/SkillNether.java
diff --git a/src/main/java/com/volmit/adapt/content/skill/SkillPickaxes.java b/src/main/java/com/volmit/adapt/content/skill/SkillPickaxes.java
diff --git a/src/main/java/com/volmit/adapt/content/skill/SkillRift.java b/src/main/java/com/volmit/adapt/content/skill/SkillRift.java
diff --git a/src/main/java/com/volmit/adapt/content/skill/SkillSeaborne.java b/src/main/java/com/volmit/adapt/content/skill/SkillSeaborne.java
diff --git a/src/main/java/com/volmit/adapt/content/skill/SkillSwords.java b/src/main/java/com/volmit/adapt/content/skill/SkillSwords.java
diff --git a/src/main/java/com/volmit/adapt/content/skill/SkillTaming.java b/src/main/java/com/volmit/adapt/content/skill/SkillTaming.java
diff --git a/src/main/java/com/volmit/adapt/content/skill/SkillTragOul.java b/src/main/java/com/volmit/adapt/content/skill/SkillTragOul.java
diff --git a/src/main/java/com/volmit/adapt/content/skill/SkillUnarmed.java b/src/main/java/com/volmit/adapt/content/skill/SkillUnarmed.java

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ plugins {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`
`27`		`-version '1.0.13-1.19.2' // Needs to be version specific`
	`27`	`+version '1.1.1-1.19.2' // Needs to be version specific`
`28`	`28`	`def nmsVersion = "1.19.2" //[NMS]`
`29`	`29`	`def apiVersion = '1.19'`
`30`	`30`	`def specialSourceVersion = '1.11.0' //[NMS]`
Original file line number	Diff line number	Diff line change
`@@ -438,8 +438,8 @@ default List<Location> vfxSelectionCube(Location corner1, Location corner2, doub`
`438`	`438`
`439`	`439`	`default void riftResistCheckAndTrigger(Player p, int duration, int amplifier) {`
`440`	`440`	`p.getWorld().playSound(p.getLocation(), Sound.ITEM_ARMOR_EQUIP_IRON, 1f, 1.24f);`
`441`		`- p.getLocation().getWorld().playSound(p.getLocation(), Sound.BLOCK_CONDUIT_AMBIENT_SHORT, 1000f, 0.01f);`
`442`		`- p.getLocation().getWorld().playSound(p.getLocation(), Sound.BLOCK_RESPAWN_ANCHOR_CHARGE, 1000f, 0.01f);`
	`441`	`+ p.getLocation().getWorld().playSound(p.getLocation(), Sound.BLOCK_CONDUIT_AMBIENT_SHORT, 1f, 0.01f);`
	`442`	`+ p.getLocation().getWorld().playSound(p.getLocation(), Sound.BLOCK_RESPAWN_ANCHOR_CHARGE, 1f, 0.01f);`
`443`	`443`	`p.addPotionEffect(new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, duration, amplifier, true, false, false));`
`444`	`444`	`}`
`445`	`445`
Original file line number	Diff line number	Diff line change
`@@ -130,8 +130,8 @@ public void on(PlayerToggleSneakEvent e) {`
`130`	`130`	`} else if (!e.isSneaking() && active) {`
`131`	`131`	`this.active.remove(e.getPlayer());`
`132`	`132`	`cooldowns.put(e.getPlayer(), M.ms() + getConfig().cooldown);`
`133`		`- e.getPlayer().getWorld().playSound(e.getPlayer().getLocation(), Sound.BLOCK_BEACON_DEACTIVATE, 100.0f, 10.0f);`
`134`		`- e.getPlayer().getWorld().playSound(e.getPlayer().getLocation(), Sound.BLOCK_SCULK_CATALYST_BREAK, 100.0f, 0.81f);`
	`133`	`+ e.getPlayer().getWorld().playSound(e.getPlayer().getLocation(), Sound.BLOCK_BEACON_DEACTIVATE, 1.0f, 10.0f);`
	`134`	`+ e.getPlayer().getWorld().playSound(e.getPlayer().getLocation(), Sound.BLOCK_SCULK_CATALYST_BREAK, 1.0f, 0.81f);`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`import org.bukkit.entity.Player;`
`31`	`31`	`import org.bukkit.entity.Projectile;`
`32`	`32`	`import org.bukkit.event.EventHandler;`
	`33`	`+import org.bukkit.event.EventPriority;`
`33`	`34`	`import org.bukkit.event.entity.EntityDamageByEntityEvent;`
`34`	`35`	`import org.bukkit.event.entity.EntityDeathEvent;`
`35`	`36`	`import org.bukkit.inventory.ItemStack;`
`@@ -96,7 +97,7 @@ public void on(EntityDamageByEntityEvent e) {`
`96`	`97`	`}`
`97`	`98`	`}`
`98`	`99`
`99`		`- @EventHandler`
	`100`	`+ @EventHandler (priority = EventPriority.HIGHEST)`
`100`	`101`	`public void on(EntityDeathEvent e) {`
`101`	`102`	`Integer c = arrows.remove(e.getEntity().getUniqueId());`
`102`	`103`
Original file line number	Diff line number	Diff line change
`@@ -148,8 +148,8 @@ private void openPearl(Player p) {`
`148`	`148`	`activeViews.add(p.openInventory(holder.getInventory()));`
`149`	`149`	`if (getConfig().showParticles) {`
`150`	`150`
`151`		`- p.playSound(p.getLocation(), Sound.PARTICLE_SOUL_ESCAPE, 100f, 0.10f);`
`152`		`- p.playSound(p.getLocation(), Sound.BLOCK_ENDER_CHEST_OPEN, 100f, 0.10f);`
	`151`	`+ p.playSound(p.getLocation(), Sound.PARTICLE_SOUL_ESCAPE, 1f, 0.10f);`
	`152`	`+ p.playSound(p.getLocation(), Sound.BLOCK_ENDER_CHEST_OPEN, 1f, 0.10f);`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,8 @@ static void riftResistStackAdd(Player p, int duration, int amplifier) {`
`54`	`54`	`return;`
`55`	`55`	`}`
`56`	`56`	`p.getWorld().playSound(p.getLocation(), Sound.ITEM_ARMOR_EQUIP_IRON, 1f, 1.24f);`
`57`		`- p.getLocation().getWorld().playSound(p.getLocation(), Sound.BLOCK_CONDUIT_AMBIENT_SHORT, 1000f, 0.01f);`
`58`		`- p.getLocation().getWorld().playSound(p.getLocation(), Sound.BLOCK_RESPAWN_ANCHOR_CHARGE, 1000f, 0.01f);`
	`57`	`+ p.getLocation().getWorld().playSound(p.getLocation(), Sound.BLOCK_CONDUIT_AMBIENT_SHORT, 1f, 0.01f);`
	`58`	`+ p.getLocation().getWorld().playSound(p.getLocation(), Sound.BLOCK_RESPAWN_ANCHOR_CHARGE, 1f, 0.01f);`
`59`	`59`	`p.addPotionEffect(new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, duration, amplifier, true, false, false));`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`import org.bukkit.entity.Player;`
`30`	`30`	`import org.bukkit.entity.Tameable;`
`31`	`31`	`import org.bukkit.event.EventHandler;`
	`32`	`+import org.bukkit.event.EventPriority;`
`32`	`33`	`import org.bukkit.event.entity.EntityDamageByEntityEvent;`
`33`	`34`	`import org.bukkit.event.entity.EntityDeathEvent;`
`34`	`35`	`import xyz.xenondevs.particle.ParticleEffect;`
`@@ -70,7 +71,7 @@ public void on(EntityDamageByEntityEvent e) {`
`70`	`71`	`}`
`71`	`72`	`}`
`72`	`73`
`73`		`- @EventHandler`
	`74`	`+ @EventHandler (priority = EventPriority.HIGHEST)`
`74`	`75`	`public void on(EntityDeathEvent e) {`
`75`	`76`	`lastDamage.remove(e.getEntity().getUniqueId());`
`76`	`77`	`}`