소스 검색

Fix for Ocelot Summoning - still need new locale string for summon
failure.

GJ 13 년 전
부모
커밋
7dc1a2ba72
2개의 변경된 파일4개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java
  2. 3 1
      src/main/java/com/gmail/nossr50/skills/Taming.java

+ 1 - 1
src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java

@@ -260,8 +260,8 @@ public class mcPlayerListener implements Listener
 		
 		
 		if(player.isSneaking() && mcPermissions.getInstance().taming(player) && (action == Action.RIGHT_CLICK_AIR || action == Action.RIGHT_CLICK_BLOCK))
 		if(player.isSneaking() && mcPermissions.getInstance().taming(player) && (action == Action.RIGHT_CLICK_AIR || action == Action.RIGHT_CLICK_BLOCK))
 		{
 		{
-			Taming.animalSummon(EntityType.WOLF, player);
 			Taming.animalSummon(EntityType.OCELOT, player);
 			Taming.animalSummon(EntityType.OCELOT, player);
+			Taming.animalSummon(EntityType.WOLF, player);
 		}
 		}
 		
 		
 		//BLAST MINING
 		//BLAST MINING

+ 3 - 1
src/main/java/com/gmail/nossr50/skills/Taming.java

@@ -173,9 +173,11 @@ public class Taming
 		case WOLF:
 		case WOLF:
 			summonItem = Material.BONE;
 			summonItem = Material.BONE;
 			summonAmount = LoadProperties.bonesConsumedByCOTW;
 			summonAmount = LoadProperties.bonesConsumedByCOTW;
+			break;
 		case OCELOT:
 		case OCELOT:
 			summonItem = Material.RAW_FISH;
 			summonItem = Material.RAW_FISH;
 			summonAmount = LoadProperties.fishConsumedByCOTW;
 			summonAmount = LoadProperties.fishConsumedByCOTW;
+			break;
 		}
 		}
 		
 		
 		if(item.getType().equals(summonItem) && item.getAmount() >= summonAmount)
 		if(item.getType().equals(summonItem) && item.getAmount() >= summonAmount)
@@ -193,7 +195,7 @@ public class Taming
 			world.spawnCreature(player.getLocation(), type);
 			world.spawnCreature(player.getLocation(), type);
 			
 			
 			int amount = item.getAmount();
 			int amount = item.getAmount();
-			amount =- summonAmount;
+			amount = amount - summonAmount;
 			player.setItemInHand(new ItemStack(summonItem, amount));
 			player.setItemInHand(new ItemStack(summonItem, amount));
 	    	player.sendMessage(mcLocale.getString("m.TamingSummon"));
 	    	player.sendMessage(mcLocale.getString("m.TamingSummon"));
 		}
 		}