Fix: damageableProjectile, see Zrips#448 in parent repo

PintaPepo · May 10, 2020 · 15c651b · 15c651b
1 parent 52ef510
commit 15c651b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/main/java/com/bekvon/bukkit/residence/Residence.java b/src/main/java/com/bekvon/bukkit/residence/Residence.java
@@ -63,6 +63,8 @@
  */
 public class Residence extends JavaPlugin {
 
+    private Logger log;
+
     private static Residence instance;
     public PermissionManager gmanager;
     public WorldItemManager imanager;
@@ -367,6 +369,8 @@ public void onDisable() {
     @Override
     public void onEnable() {
         try {
+            log = getLogger();
+            log.setLevel(Level.ALL);
             instance = this;
 
             initsuccess = false;

diff --git a/src/main/java/com/bekvon/bukkit/residence/listeners/ResidenceEntityListener.java b/src/main/java/com/bekvon/bukkit/residence/listeners/ResidenceEntityListener.java
@@ -43,10 +43,14 @@ public static boolean isMonster(Entity ent) {
     }
 
     private static boolean isTamed(Entity ent) {
-        return (ent instanceof Tameable ? ((Tameable) ent).isTamed() : false);
+        return (ent instanceof Tameable && ((Tameable) ent).isTamed());
     }
 
     private static boolean damageableProjectile(Entity ent) {
+        if(ent instanceof AbstractArrow){
+            return true;
+        }
+        // TODO improve performance use Set, or directly remove all the checks
         if (ent instanceof Projectile && ent.getType().toString().equalsIgnoreCase("Splash_potion")) {
             for (PotionEffect one : ((ThrownPotion) ent).getEffects()) {
                 for (String oneHarm : Residence.getInstance().getConfigManager().getNegativePotionEffects()) {
@@ -55,7 +59,7 @@ private static boolean damageableProjectile(Entity ent) {
                 }
             }
         }
-        return ent instanceof Arrow || ent instanceof Projectile && (ent.getType().toString().equalsIgnoreCase("Trident"));
+        return false;
     }
 
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
@@ -98,8 +102,6 @@ public void AnimalKilling(EntityDamageByEntityEvent event) {
             return;
         // disabling event on world
         Entity entity = event.getEntity();
-        if (entity == null)
-            return;
         if (plugin.isDisabledWorldListener(entity.getWorld()))
             return;
         if (!plugin.getNms().isAnimal(entity))

diff --git a/src/main/java/com/bekvon/bukkit/residence/protection/FlagPermissions.java b/src/main/java/com/bekvon/bukkit/residence/protection/FlagPermissions.java
@@ -31,7 +31,7 @@ public class FlagPermissions {
     protected Map<String, Map<String, Boolean>> groupFlags = new ConcurrentHashMap<>();
     protected Map<String, Boolean> cuboidFlags = new ConcurrentHashMap<>();
     protected FlagPermissions parent;
-    
+
     public static void addMaterialToUseFlag(Material mat, Flags flag) {
         if (mat == null)
             return;