Browse Source

Added Ocelots to Taming XP tables.

GJ 13 years ago
parent
commit
a83812d11a

+ 3 - 0
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

+ 1 - 1
pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>1.3.02</version>
+    <version>2.0.00-dev</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <issueManagement>

+ 1 - 1
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);
 

+ 0 - 4
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);