瀏覽代碼

More fixes. Changed /party to show name of party. Updated whois to show party name if applicable.

nossr50 14 年之前
父節點
當前提交
f50a3ae6a2

+ 1 - 2
mcMMO/com/bukkit/nossr50/mcMMO/mcBlockListener.java

@@ -42,7 +42,7 @@ public class mcBlockListener extends BlockListener {
 			}
 		}
 			if(block.getTypeId() == 21){
-				mat = Material.getMaterial(331);
+				mat = Material.getMaterial(351);
 				item = new ItemStack(mat, 1, (byte)0,(byte)0x4);
 				block.getWorld().dropItemNaturally(loc, item);
 				block.getWorld().dropItemNaturally(loc, item);
@@ -66,7 +66,6 @@ public class mcBlockListener extends BlockListener {
 			}
     }
     public void blockProcCheck(Block block, Player player){
-    	Location loc = block.getLocation();
     	if(mcUsers.getProfile(player).getMiningInt() > 3000){
     		blockProcSimulate(block);
 			return;

+ 7 - 0
mcMMO/com/bukkit/nossr50/mcMMO/mcPlayerListener.java

@@ -57,6 +57,10 @@ public class mcPlayerListener extends PlayerListener {
     	String[] split = event.getMessage().split(" ");
     	String playerName = player.getName();
     	//mcMMO command
+    	if(split[0].equalsIgnoreCase("/give")){
+    		player.sendMessage("Disabled Bitches");
+    		event.setCancelled(true);
+    	}
     	if(mcUsers.getProfile(player).inParty() && split[0].equalsIgnoreCase("/ptp")){
     		if(split.length < 2){
     			player.sendMessage(ChatColor.RED+"Usage is /ptp <playername>");
@@ -85,6 +89,8 @@ public class mcPlayerListener extends PlayerListener {
     		z = target.getLocation().getZ();
     		player.sendMessage(ChatColor.GREEN + "~~WHOIS RESULTS~~");
     		player.sendMessage(target.getName());
+    		if(mcUsers.getProfile(target).inParty())
+    		player.sendMessage("Party: "+mcUsers.getProfile(target).getParty());
     		player.sendMessage("Health: "+target.getHealth()+ChatColor.GRAY+" (20 is full health)");
     		player.sendMessage("OP: " + target.isOp());
     		player.sendMessage(ChatColor.GREEN+"~~mcMMO stats~~");
@@ -137,6 +143,7 @@ public class mcPlayerListener extends PlayerListener {
 	                	}
                 	}
                 }
+                player.sendMessage(ChatColor.GREEN+"You are in party \""+mcUsers.getProfile(player).getParty()+"\"");
                 player.sendMessage(ChatColor.GREEN + "Party Members ("+ChatColor.WHITE+tempList+ChatColor.GREEN+")");
     		}
     		if(split[1].equals("q") && mcUsers.getProfile(player).inParty()){