revert

MarioFinale · Jun 25, 2021 · 07f4023 · 07f4023
1 parent 7a4901d
commit 07f4023
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/out/production/VillagerSaver/plugin.yml b/out/production/VillagerSaver/plugin.yml
@@ -1,9 +1,13 @@
 name: VillagerSaver
 <<<<<<< HEAD
+<<<<<<< HEAD
 version: 1.1.6
 =======
 version: 1.1.5
 >>>>>>> parent of 688c16c (Minor changes)
+=======
+version: 1.1.5
+>>>>>>> parent of 688c16c (Minor changes)
 author: MarioFinale
 main: cl.mariofinale.villagerSaver
 api-version: 1.13

diff --git a/src/cl/mariofinale/VillagerSaver_Listener.java b/src/cl/mariofinale/VillagerSaver_Listener.java
@@ -177,6 +177,7 @@ public void onEntityDamageByEntity(EntityDamageByEntityEvent event){
         Entity tKiller = event.getDamager();
         if (!(tVillager.getHealth() - event.getDamage() <= 0)) return;
         if (!(tVillager.getType() == EntityType.VILLAGER)) return;
+<<<<<<< HEAD
 <<<<<<< HEAD
         if (!((tKiller.getType() == EntityType.ZOMBIE) || (tKiller.getType() == EntityType.ZOMBIE_VILLAGER)  || (tKiller.getType() == EntityType.DROWNED) || (tKiller.getType() == EntityType.HUSK))) return;
         if (villagerSaver.WorldBlackList.contains(tVillager.getWorld().getName())) return;
@@ -236,6 +237,14 @@ public void StoreAndClearVillager(Entity villager){ //CALLED WHEN A VILLAGER IS
         event.setCancelled(true);
     }
 
+=======
+        if (!((tKiller.getType() == EntityType.ZOMBIE) || (tKiller.getType() == EntityType.ZOMBIE_VILLAGER)  || (tKiller.getType() == EntityType.DROWNED) || (tKiller.getType() == EntityType.HUSK) || (tKiller.getType() == EntityType.ZOMBIFIED_PIGLIN))) return;
+        if (villagerSaver.WorldBlackList.contains(tVillager.getWorld().getName())) return;
+        handleSpawnZombieVillager(tVillager);
+        event.setCancelled(true);
+    }
+
+>>>>>>> parent of 688c16c (Minor changes)
     public void handleSpawnZombieVillager(LivingEntity entityliving) {
         CraftVillager craftVillager = (CraftVillager) entityliving;
         Entity vehicle = craftVillager.getVehicle();