Merge branch 'master' of me.github.com:EngineHub/CommandHelper

EngineHub · Feb 20, 2018 · 30211d3 · 30211d3
2 parents 019dc13 + b166c64
commit 30211d3
Show file tree

Hide file tree

Showing 11 changed files with 1,066 additions and 929 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,22 +1,23 @@
-/target/
-/.settings/
-/.idea/
-/plugins/
-/com/
-/CommandHelper/
-/bin/
-.classpath
-.project
-*.iml
-nbproject/
-nbactions-provisional-build.xml
-nbactions-release-profile.xml
-nbactions.xml
-nb-configuration.xml
-true
-/logs/
-/.logs/
-/preferences.*
-.DS_Store
-/test-backend/
-/nbproject/
+/target/
+/.settings/
+/.idea/
+/plugins/
+/com/
+/CommandHelper/
+/bin/
+.classpath
+.project
+*.iml
+nbproject/
+nbactions-provisional-build.xml
+nbactions-release-profile.xml
+nbactions.xml
+nb-configuration.xml
+true
+/logs/
+/.logs/
+/preferences.*
+.DS_Store
+/test-backend/
+/nbproject/
+/dependency-reduced-pom.xml
diff --git a/src/main/java/com/laytonsmith/abstraction/MCLivingEntity.java b/src/main/java/com/laytonsmith/abstraction/MCLivingEntity.java
@@ -9,6 +9,7 @@
 public interface MCLivingEntity extends MCEntity, MCProjectileSource {
 	void addEffect(int potionID, int strength, int ticks, boolean ambient, boolean particles, Target t);
 	boolean removeEffect(int potionID);
+	void removeEffects();
 	/**
 	 * Returns the maximum effect id, inclusive.
 	 * @return 

diff --git a/src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCWorld.java b/src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCWorld.java
@@ -752,7 +752,7 @@ public CArray spawnMob(MCMobs name, String subClass, int qty, MCLocation l, Targ
 										}
 										break;
 									case HUSK:
-										if(version.gte(MCVersion.MC1_10)) { // < MC 1.11
+										if(version.gte(MCVersion.MC1_10) && version.lt(MCVersion.MC1_11)) {
 											z.setVillagerProfession(Villager.Profession.HUSK);
 										}
 										break;

diff --git a/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCLivingEntity.java b/src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCLivingEntity.java
@@ -223,7 +223,7 @@ public int getMaxEffect(){
 	}
 
 	@Override
-    public boolean removeEffect(int potionID) {
+	public boolean removeEffect(int potionID) {
 		PotionEffectType t = PotionEffectType.getById(potionID);
 		boolean hasIt = false;
 		for(PotionEffect pe : le.getActivePotionEffects()) {
@@ -234,7 +234,14 @@ public boolean removeEffect(int potionID) {
 		}
 		le.removePotionEffect(t);
 		return hasIt;
-    }
+	}
+
+	@Override
+	public void removeEffects() {
+		for(PotionEffect pe : le.getActivePotionEffects()) {
+			le.removePotionEffect(pe.getType());
+		}
+	}
 
 	@Override
 	public List<MCEffect> getEffects(){