Browse Source

fix to PR

nossr50 9 months ago
parent
commit
d42581b24f
2 changed files with 9 additions and 3 deletions
  1. 6 0
      Changelog.txt
  2. 3 3
      src/main/java/com/gmail/nossr50/listeners/EntityListener.java

+ 6 - 0
Changelog.txt

@@ -1,3 +1,9 @@
+Version 2.2.022
+    Fixed a bug where Roll was always reducing damage (thanks Ineusia)
+    Fix COTW errors on older versions (thanks Warriorrrr)
+    Fixed Slime Spawner not marking divided cubes as being from a mob spawner (thanks Ineusia).
+
+
 Version 2.2.021
 Version 2.2.021
     Fixed issue where Roll wasn't reducing as much damage as it should have been (thanks Ineusia)
     Fixed issue where Roll wasn't reducing as much damage as it should have been (thanks Ineusia)
     Updated locale_es (thanks Devilcasters)
     Updated locale_es (thanks Devilcasters)

+ 3 - 3
src/main/java/com/gmail/nossr50/listeners/EntityListener.java

@@ -58,7 +58,7 @@ public class EntityListener implements Listener {
      * check if a {@link Player} has a {@link Trident} enchanted with "Piercing".
      * check if a {@link Player} has a {@link Trident} enchanted with "Piercing".
      */
      */
     private final NamespacedKey piercingEnchantment = NamespacedKey.minecraft("piercing");
     private final NamespacedKey piercingEnchantment = NamespacedKey.minecraft("piercing");
-    private final List<EntityType> transformableEntities = Arrays.asList(EntityType.SLIME, EntityType.MAGMA_CUBE);
+    private final static List<EntityType> TRANSFORMABLE_ENTITIES = Arrays.asList(EntityType.SLIME, EntityType.MAGMA_CUBE);
 
 
     public EntityListener(final mcMMO pluginRef) {
     public EntityListener(final mcMMO pluginRef) {
         this.pluginRef = pluginRef;
         this.pluginRef = pluginRef;
@@ -78,7 +78,7 @@ public class EntityListener implements Listener {
             }
             }
 
 
             // Clear the original slime/magma cubes metadata - it's dead.
             // Clear the original slime/magma cubes metadata - it's dead.
-            if (transformableEntities.contains(livingEntity.getType())) {
+            if (TRANSFORMABLE_ENTITIES.contains(livingEntity.getType())) {
                 mcMMO.getTransientMetadataTools().cleanLivingEntityMetadata(livingEntity);
                 mcMMO.getTransientMetadataTools().cleanLivingEntityMetadata(livingEntity);
             }
             }
         }
         }
@@ -664,7 +664,7 @@ public class EntityListener implements Listener {
         LivingEntity entity = event.getEntity();
         LivingEntity entity = event.getEntity();
 
 
         // Clear metadata for Slimes/Magma Cubes after transformation events take place, otherwise small spawned slimes will not have any tags
         // Clear metadata for Slimes/Magma Cubes after transformation events take place, otherwise small spawned slimes will not have any tags
-        if (transformableEntities.contains(entity.getType())) {
+        if (TRANSFORMABLE_ENTITIES.contains(entity.getType())) {
             return;
             return;
         }
         }