BlazingGames/blazing-games-plugin
BlazingGames/blazing-games-plugin
0
0
Fork 0
mirror of https://github.com/BlazingGames/blazing-games-plugin.git synced 2025-02-03 21:26:41 -05:00
Code Issues Releases 10 Activity Actions

Merge pull request #20 from BlazingGames/bugfixes
All checks were successful
Build, Test and Publish / test (push) Successful in 3m47s
Details
Build, Test and Publish / build-and-publish (push) Successful in 3m3s
Details

Browse source 
Fixes for slab shulkers dying
This commit is contained in:
sbot50 2025-02-02 18:37:14 +00:00 committed by GitHub
commit fe0cc82d53
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/de/blazemcworld/blazinggames/events/EntityDamagedByEventListener.java
View file

@ -88,11 +88,12 @@ public class EntityDamagedByEventListener implements Listener {
p.getWorld().playSound(p, Sound.ENCHANT_THORNS_HIT, 1, 1.5f);
}
}
} else if (damager instanceof Player p) {
} else {
PersistentDataContainer container = victim.getPersistentDataContainer();
if (container.has(BlazingGames.get().key("slab")) && container.has(BlazingGames.get().key("slab_type"))) {
event.setCancelled(true);
if (!(damager instanceof Player p)) return;
UUID displayBlockUUID = UUID.fromString(Objects.requireNonNull(container.get(BlazingGames.get().key("slab"), PersistentDataType.STRING)));
String slabType = container.get(BlazingGames.get().key("slab_type"), PersistentDataType.STRING);
ItemDisplay displayBlock = (ItemDisplay) p.getWorld().getEntity(displayBlockUUID);

9
src/main/java/de/blazemcworld/blazinggames/events/EntityDeathEventListener.java
View file

@ -15,6 +15,7 @@
*/
package de.blazemcworld.blazinggames.events;
import de.blazemcworld.blazinggames.BlazingGames;
import de.blazemcworld.blazinggames.enchantments.sys.CustomEnchantments;
import de.blazemcworld.blazinggames.enchantments.sys.EnchantmentHelper;
import org.bukkit.Material;
@ -26,6 +27,7 @@ import org.bukkit.event.Listener;
import org.bukkit.event.entity.CreatureSpawnEvent;
import org.bukkit.event.entity.EntityDeathEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.persistence.PersistentDataContainer;
import java.util.ArrayList;
import java.util.List;
@ -43,6 +45,13 @@ public class EntityDeathEventListener implements Listener {
LivingEntity victim = event.getEntity();
Player killer = victim.getKiller();
PersistentDataContainer container = victim.getPersistentDataContainer();
if (container.has(BlazingGames.get().key("slab")) && container.has(BlazingGames.get().key("slab_type"))) {
event.setCancelled(true);
return;
}
if(killer == null) {
return;
}