All changes up to 0.9.16

mcMMO/Changelog.txt

@@ -1,7 +1,14 @@
 Changelog:
 #Versions without changelogs probably had very small misc fixes, like tweaks to the source code#
+Version 0.9.16
+Logs placed by the player won't grant XP/Double Drops anymore
+Added more functions plugin authors can call
+Acrobatics roll has a damage threshold of 20, going above this means a failed Roll
+
+
 Version 0.9.15
-AoE Abilities will only hit wolves attacking you
+Acrobatics will now behave properly
+AoE Abilities ignore wolves (temp fix)
 Added "all" parameter to /mmoedit & /addxp
 After giving XP to a player it will now check for level ups in skills
 

mcMMO/com/gmail/nossr50/mcAcrobatics.java

@@ -4,6 +4,7 @@ import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageEvent;
 
+
 public class mcAcrobatics {
 	private static volatile mcAcrobatics instance;
 	public static mcAcrobatics getInstance() {
@@ -13,7 +14,7 @@ public class mcAcrobatics {
     	return instance;
     	}
 	public void acrobaticsCheck(Player player, EntityDamageEvent event, Location loc, int xx, int y, int z){
-    	if(player != null && mcPermissions.getInstance().acrobatics(player)){
+    	if(player != null && mcPermissions.getInstance().acrobatics(player)&& event.getDamage() < 21){
 			if(Math.random() * 1000 <= mcUsers.getProfile(player).getAcrobaticsInt()){
 				player.sendMessage("**ROLLED**");
 				if(!mcConfig.getInstance().isBlockWatched(loc.getWorld().getBlockAt(xx, y, z))){

mcMMO/com/gmail/nossr50/mcBlockListener.java

@@ -12,6 +12,7 @@ import org.bukkit.event.block.BlockListener;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.inventory.ItemStack;
 
+
 public class mcBlockListener extends BlockListener {
     private final mcMMO plugin;
 

mcMMO/com/gmail/nossr50/mcCombat.java

@@ -18,6 +18,7 @@ import org.bukkit.event.entity.EntityDamageByProjectileEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.inventory.ItemStack;
 
+
 public class mcCombat {
 	private static mcMMO plugin;
 	public mcCombat(mcMMO instance) {
@@ -514,13 +515,10 @@ public class mcCombat {
     				target.damage(event.getDamage() / 2);
     				targets--;
     			}
-    			if(derp instanceof Animals  && targets >= 1){
     			if(derp instanceof Wolf){
-    					if(((Wolf) derp).isAngry() && ((Wolf) derp).getTarget() != attacker){
 					continue;
 				}
-    				}
+    			if(derp instanceof Animals  && targets >= 1){					
-    					
     				Animals target = (Animals)derp;
     				target.damage(event.getDamage() / 2);
     				targets--;
@@ -551,9 +549,10 @@ public class mcCombat {
     				target.damage(event.getDamage() / 4);
     				targets--;
     			}
-    			if(derp instanceof Animals && targets >= 1){
+    			if(derp instanceof Wolf){
-    				if(derp instanceof Wolf)
 					continue;
+				}
+    			if(derp instanceof Animals && targets >= 1){
     				if(!mcConfig.getInstance().isBleedTracked(derp))
     					mcConfig.getInstance().addToBleedQue(x);
     				Animals target = (Animals)derp;

mcMMO/com/gmail/nossr50/mcEntityListener.java

@@ -20,6 +20,7 @@ import org.bukkit.event.entity.EntityListener;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.Vector;
 
+
 public class mcEntityListener extends EntityListener {
 	private final mcMMO plugin;
 

mcMMO/com/gmail/nossr50/mcExcavation.java

@@ -7,6 +7,7 @@ import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
+
 public class mcExcavation {
 	private static mcMMO plugin;
 	public mcExcavation(mcMMO instance) {

mcMMO/com/gmail/nossr50/mcHerbalism.java

@@ -7,6 +7,7 @@ import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
+
 public class mcHerbalism {
 	private static mcMMO plugin;
 	public mcHerbalism(mcMMO instance) {

mcMMO/com/gmail/nossr50/mcItem.java

@@ -6,6 +6,7 @@ import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
+
 public class mcItem {
 	private static mcMMO plugin;
 	public mcItem(mcMMO instance) {

mcMMO/com/gmail/nossr50/mcMMO.java

@@ -1,4 +1,5 @@
 package com.gmail.nossr50;
+
 import com.nijikokun.bukkit.Permissions.Permissions;
 import com.nijiko.Messaging;
 import com.nijiko.permissions.PermissionHandler;
@@ -24,7 +25,6 @@ public class mcMMO extends JavaPlugin {
     private final mcPlayerListener playerListener = new mcPlayerListener(this);
     private final mcBlockListener blockListener = new mcBlockListener(this);
     private final mcEntityListener entityListener = new mcEntityListener(this);
-    //private final mcServerListener serverListener = new mcServerListener(this);
     private final String name = "mcMMO";
     public static PermissionHandler PermissionsHandler = null;
     private Permissions permissions;
@@ -32,9 +32,8 @@ public class mcMMO extends JavaPlugin {
     
     public void onEnable() {
     	mcMMO_Timer.schedule(new mcTimer(this), 0, (long)(1000));
-    	//Make the directory if it does not exist
     	new File(maindirectory).mkdir();
-    	//Make the file if it does not exist
+
     	if(!Properties.exists()){
 	    	try {
 				Properties.createNewFile();
@@ -78,8 +77,6 @@ public class mcMMO extends JavaPlugin {
         pm.registerEvent(Event.Type.PLAYER_ITEM_HELD, playerListener, Priority.Normal, this);
         pm.registerEvent(Event.Type.ENTITY_DAMAGE, entityListener, Priority.Highest, this);
         
-        //pm.registerEvent(Event.Type.CREATURE_SPAWN, entityListener, Priority.Normal, this);
-        //Displays a message when plugin is loaded
         PluginDescriptionFile pdfFile = this.getDescription();
         mcPermissions.initialize(getServer());
         System.out.println( pdfFile.getName() + " version " + pdfFile.getVersion() + " is enabled!" );
@@ -113,6 +110,12 @@ public class mcMMO extends JavaPlugin {
     		return false;
     	}
     }
+    public void addXp(Player player, String skillname, Integer newvalue){
+    	mcUsers.getProfile(player).addXpToSkill(newvalue, skillname);
+    }
+    public void modifySkill(Player player, String skillname, Integer newvalue){
+    	mcUsers.getProfile(player).modifyskill(newvalue, skillname);
+    }
     public boolean isAdminChatToggled(Player player){
     	if(mcConfig.getInstance().isAdminToggled(player.getName())){
     		return true;

mcMMO/com/gmail/nossr50/mcMining.java

@@ -7,6 +7,7 @@ import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
+
 public class mcMining {
 	private static mcMMO plugin;
 	public mcMining(mcMMO instance) {

mcMMO/com/gmail/nossr50/mcParty.java

@@ -3,6 +3,7 @@ package com.gmail.nossr50;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
+
 public class mcParty {
 	private static mcMMO plugin;
 	public mcParty(mcMMO instance) {

mcMMO/com/gmail/nossr50/mcPlayerListener.java

@@ -19,6 +19,7 @@ import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.inventory.ItemStack;
 
+
 public class mcPlayerListener extends PlayerListener {
 	protected static final Logger log = Logger.getLogger("Minecraft");
 	public Location spawn = null;
@@ -241,7 +242,6 @@ public class mcPlayerListener extends PlayerListener {
     				mcUsers.getProfile(getPlayer(split[1])).addXpToSkill(newvalue, split[2]);
     				getPlayer(split[1]).sendMessage(ChatColor.GREEN+"Experience granted!");
     				player.sendMessage(ChatColor.RED+split[2]+" has been modified.");
-    				mcSkills.getInstance().XpCheck(getPlayer(split[1]));
     			}
     		}
     		else if(split.length == 3){
@@ -249,7 +249,6 @@ public class mcPlayerListener extends PlayerListener {
     				int newvalue = Integer.valueOf(split[2]);
     				mcUsers.getProfile(player).addXpToSkill(newvalue, split[1]);
     				player.sendMessage(ChatColor.RED+split[1]+" has been modified.");
-    				mcSkills.getInstance().XpCheck(player);
     			}
     		} else {
     			player.sendMessage(ChatColor.RED+"Usage is /"+mcLoadProperties.addxp+" playername skillname xp");

mcMMO/com/gmail/nossr50/mcRepair.java

@@ -5,6 +5,7 @@ import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
+
 public class mcRepair {
 	private static mcMMO plugin;
 	public mcRepair(mcMMO instance) {

mcMMO/com/gmail/nossr50/mcSkills.java

@@ -6,6 +6,7 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
+
 public class mcSkills {
 	private static mcMMO plugin;
 	public mcSkills(mcMMO instance) {

mcMMO/com/gmail/nossr50/mcTimer.java

@@ -5,6 +5,7 @@ import java.util.TimerTask;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.*;
 
+
 public class mcTimer extends TimerTask{
 	private final mcMMO plugin;
 	int thecount = 1;

mcMMO/com/gmail/nossr50/mcUsers.java

@@ -10,6 +10,7 @@ import org.bukkit.Location;
 import org.bukkit.entity.*;
 import org.bukkit.plugin.Plugin;
 
+
 public class mcUsers {
     private static volatile mcUsers instance;
     protected static final Logger log = Logger.getLogger("Minecraft");
@@ -1503,6 +1504,7 @@ class PlayerList
 				axesgather = String.valueOf(Integer.valueOf(axesgather)+newvalue);
 			}
 			save();
+			mcSkills.getInstance().XpCheck(thisplayer);
 		}
 		public void modifyskill(int newvalue, String skillname){
 			if(skillname.toLowerCase().equals("mining")){

mcMMO/com/gmail/nossr50/mcWoodCutting.java

@@ -9,6 +9,7 @@ import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
+
 public class mcWoodCutting {
 	int w = 0;
 	private boolean isdone = false;

mcMMO/com/gmail/nossr50/mcm.java

@@ -13,6 +13,7 @@ import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.player.PlayerChatEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.Plugin;
+
 public class mcm {
 	/*
 	 * I'm storing my functions/methods in here in an unorganized manner. Spheal with it.
@@ -159,7 +160,7 @@ public class mcm {
 	}
 	public boolean shouldBeWatched(Block block){
 		int id = block.getTypeId();
-		if(id == 42 || id == 87 || id == 89 || id == 2 || id == 3 || id == 12 || id == 13 || id == 21 || id == 15 || id == 14 || id == 56 || id == 38 || id == 37 || id == 39 || id == 40 || id == 24){
+		if(id == 17 || id == 42 || id == 87 || id == 89 || id == 2 || id == 3 || id == 12 || id == 13 || id == 21 || id == 15 || id == 14 || id == 56 || id == 38 || id == 37 || id == 39 || id == 40 || id == 24){
 			return true;
 		} else {
 			return false;

mcMMO/plugin.yml

@@ -1,3 +1,3 @@
 name: mcMMO
 main: com.gmail.nossr50.mcMMO
-version: 0.9.15
+version: 0.9.16