2
0
Эх сурвалжийг харах

Fixed a small bug where players could salvage items in creative mode

TfT_02 12 жил өмнө
parent
commit
7f16339bd9

+ 1 - 1
.gitignore

@@ -1,4 +1,4 @@
-# Eclipse stuffs
+# Eclipse stuff
 /.classpath
 /.project
 /.settings

+ 20 - 18
src/main/java/com/gmail/nossr50/skills/repair/Salvage.java

@@ -27,27 +27,29 @@ public class Salvage {
             return;
         }
 
-        final PlayerProfile profile = Users.getProfile(player);
-        final int skillLevel = profile.getSkillLevel(SkillType.REPAIR);
-        final int unlockLevel = configInstance.getSalvageUnlockLevel();
+        if (player.getGameMode().equals(0)){
+        	final PlayerProfile profile = Users.getProfile(player);
+        	final int skillLevel = profile.getSkillLevel(SkillType.REPAIR);
+        	final int unlockLevel = configInstance.getSalvageUnlockLevel();
 
-        if (skillLevel >= unlockLevel) {
-            final World world = player.getWorld();
-            final float currentdura = inHand.getDurability();
+        	if (skillLevel >= unlockLevel) {
+        		final World world = player.getWorld();
+        		final float currentdura = inHand.getDurability();
 
-            if (currentdura == 0) {
-                final int salvagedAmount = getSalvagedAmount(inHand);
-                final int itemID = getSalvagedItemID(inHand);
+        		if (currentdura == 0) {
+        			final int salvagedAmount = getSalvagedAmount(inHand);
+        			final int itemID = getSalvagedItemID(inHand);
 
-                player.setItemInHand(new ItemStack(0));
-                location.setY(location.getY() + 1);
-                world.dropItem(location, new ItemStack(itemID, salvagedAmount));
-                player.sendMessage(LocaleLoader.getString("Repair.Skills.SalvageSuccess"));
-            } else {
-                player.sendMessage(LocaleLoader.getString("Repair.Skills.NotFullDurability"));
-            }
-        } else {
-            player.sendMessage(LocaleLoader.getString("Repair.Skills.AdeptSalvage"));
+        			player.setItemInHand(new ItemStack(0));
+        			location.setY(location.getY() + 1);
+        			world.dropItem(location, new ItemStack(itemID, salvagedAmount));
+        			player.sendMessage(LocaleLoader.getString("Repair.Skills.SalvageSuccess"));
+        		} else {
+        			player.sendMessage(LocaleLoader.getString("Repair.Skills.NotFullDurability"));
+        		}
+        	} else {
+        		player.sendMessage(LocaleLoader.getString("Repair.Skills.AdeptSalvage"));
+        	}
         }
     }