From 9fe3f693f1d6d015f45898818b7958b3a57a9f4a Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Fri, 26 Jul 2019 04:23:36 +0100
Subject: + Added config option to adjust ingame BGM delays. (Should be
 working) + Added a Pest Killer for quick removal of Butterflies and Bats. +
 Added Hydrogen Cyanide. % Replaced existing assets for the Bat King. %
 Replaced Bat King Logic, it's now an offensive mob. $ Fixed Bat King model
 scaling.

---
 .../plugin/villagers/Core_VillagerAdditions.java         | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'src/Java/gtPlusPlus/plugin/villagers')

diff --git a/src/Java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java b/src/Java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java
index 01fd549c7b..09e4c4865f 100644
--- a/src/Java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java
+++ b/src/Java/gtPlusPlus/plugin/villagers/Core_VillagerAdditions.java
@@ -101,6 +101,22 @@ public class Core_VillagerAdditions implements IPlugin {
 		return false;
 	}
 
+	@Override
+	public boolean serverStart() {
+		if (shouldLoad) {
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean serverStop() {
+		if (shouldLoad) {
+			return true;
+		}
+		return false;
+	}
+
 	@Override
 	public String getPluginName() {
 		return "GT++ Enhanced Villagers";
-- 
cgit 


From 4a2fa070a2ae91173cf15785c63b4090016323d4 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Fri, 11 Oct 2019 18:14:07 +0100
Subject: $ Fixed many tiny bugs, found by static code analysis. $ Fixed
 Canning handling further. $ Adjusted the Charcoal Pit fix.

---
 .../gtPlusPlus/plugin/villagers/entity/EntityBaseVillager.java     | 5 +++--
 .../gtPlusPlus/plugin/villagers/entity/EntityNativeAustralian.java | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/Java/gtPlusPlus/plugin/villagers')

diff --git a/src/Java/gtPlusPlus/plugin/villagers/entity/EntityBaseVillager.java b/src/Java/gtPlusPlus/plugin/villagers/entity/EntityBaseVillager.java
index 4dc5a15b4b..c29aadb16b 100644
--- a/src/Java/gtPlusPlus/plugin/villagers/entity/EntityBaseVillager.java
+++ b/src/Java/gtPlusPlus/plugin/villagers/entity/EntityBaseVillager.java
@@ -70,7 +70,7 @@ public class EntityBaseVillager extends EntityVillager {
 	@Override
 	public void readEntityFromNBT(NBTTagCompound aNBT) {
 		if (aNBT.hasKey("aCustomName")) {
-			if (this.getCustomNameTag() != aNBT.getString("aCustomName")) {
+			if (!this.getCustomNameTag().equals(aNBT.getString("aCustomName"))) {
 				this.setCustomNameTag(aNBT.getString("aCustomName"));
 			}
 		}
@@ -202,9 +202,10 @@ public class EntityBaseVillager extends EntityVillager {
 
 	protected MerchantRecipeList getBuyingList() {
 		Field v82191;
-		MerchantRecipeList o;
+		MerchantRecipeList o = null;
 		v82191 = ReflectionUtils.getField(getClass(), "buyingList");
 		try {
+			if (v82191 != null)
 			o = (MerchantRecipeList) v82191.get(this);
 			Logger.WARNING("Is BuyingList Valid? " + (v82191 != null));
 			return v82191 != null ? o : null;
diff --git a/src/Java/gtPlusPlus/plugin/villagers/entity/EntityNativeAustralian.java b/src/Java/gtPlusPlus/plugin/villagers/entity/EntityNativeAustralian.java
index 967647cff6..4f9e2954a4 100644
--- a/src/Java/gtPlusPlus/plugin/villagers/entity/EntityNativeAustralian.java
+++ b/src/Java/gtPlusPlus/plugin/villagers/entity/EntityNativeAustralian.java
@@ -79,7 +79,7 @@ public class EntityNativeAustralian extends EntityVillager {
 	@Override
 	public void readEntityFromNBT(NBTTagCompound aNBT) {
 		if (aNBT.hasKey("aCustomName")) {
-			if (this.getCustomNameTag() != aNBT.getString("aCustomName")) {
+			if (!this.getCustomNameTag().equals(aNBT.getString("aCustomName"))) {
 				this.setCustomNameTag(aNBT.getString("aCustomName"));
 			}
 		}
@@ -105,7 +105,7 @@ public class EntityNativeAustralian extends EntityVillager {
 
 	@Override
 	public void setProfession(int p_70938_1_) {
-		super.setProfession(mRoleID);
+		super.setProfession(7738);
 	}
 
 	@Override
@@ -190,9 +190,10 @@ public class EntityNativeAustralian extends EntityVillager {
 
 	protected MerchantRecipeList getBuyingList() {
 		Field v82191;
-		MerchantRecipeList o;
+		MerchantRecipeList o = null;
 		v82191 = ReflectionUtils.getField(getClass(), "buyingList");
 		try {
+			if (v82191 != null)
 			o = (MerchantRecipeList) v82191.get(this);
 			Logger.WARNING("Is BuyingList Valid? " + (v82191 != null));
 			return v82191 != null ? o : null;
-- 
cgit