diff --git a/Changelog.txt b/Changelog.txt index 7e05cbc2f..591be7fe6 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -6,6 +6,9 @@ Key: = Fix ! Change - Removal + +Version 2.0.00-dev + + Added Ocelots to Taming XP tables Version 1.3.02 + Added in game guides for Mining, Excavation, and Acrobatics. Simply type /skillname ? to access them diff --git a/pom.xml b/pom.xml index 0d1ccbd17..dcd8ce265 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.gmail.nossr50.mcMMO mcMMO - 1.3.02 + 2.0.00-dev mcMMO https://github.com/mcMMO-Dev/mcMMO diff --git a/src/main/java/com/gmail/nossr50/config/LoadProperties.java b/src/main/java/com/gmail/nossr50/config/LoadProperties.java index faa68e6cd..e1094b2c2 100644 --- a/src/main/java/com/gmail/nossr50/config/LoadProperties.java +++ b/src/main/java/com/gmail/nossr50/config/LoadProperties.java @@ -243,7 +243,7 @@ public class LoadProperties { mmossstone = readInteger("Experience.Mining.Moss_Stone", 30); mtameWolf = readInteger("Experience.Taming.Animal_Taming.Wolf", 250); - mtameOcelot = readInteger("Experience.Taming.Animal_Taming.Wolf", 500); + mtameOcelot = readInteger("Experience.Taming.Animal_Taming.Ocelot", 500); mfishing = readInteger("Experience.Fishing.Base", 800); diff --git a/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java b/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java index 344ddb147..a5204d90f 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java @@ -138,9 +138,7 @@ public class mcEntityListener implements Listener //Remove mob from mob spawner list if(plugin.misc.mobSpawnerList.contains(x.getEntityId())) - { plugin.misc.mobSpawnerList.remove((Object)x.getEntityId()); - } //Remove bleed track if(plugin.misc.bleedTracker.contains(x)) @@ -311,11 +309,9 @@ public class mcEntityListener implements Listener case WOLF: xp = LoadProperties.mtameWolf; break; - /* case OCELOT: xp = LoadProperties.mtameOcelot; break; - */ } PP.addXP(SkillType.TAMING, xp, player);