updated to 1.11, fixed skill multiplier calculation

RypoFalem · Nov 17, 2016 · 9a674a8 · 9a674a8
1 parent f485d18
commit 9a674a8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 25 deletions.
diff --git a/resources/plugin.yml b/resources/plugin.yml
@@ -8,6 +8,5 @@ softdepend: [Skills]
 commands:
 permissions:
   growstick.use:
-    escription: Use the growstick.
-    default: true
-
+    description: Use the growstick.
+    default: true
diff --git a/src/io/github/rypofalem/growstick/BlockUpdater.java b/src/io/github/rypofalem/growstick/BlockUpdater.java
@@ -1,17 +1,17 @@
 package io.github.rypofalem.growstick;
 
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_10_R1.util.CraftMagicNumbers;
+import org.bukkit.craftbukkit.v1_11_R1.util.CraftMagicNumbers;
 
-import net.minecraft.server.v1_10_R1.BlockPosition;
+import net.minecraft.server.v1_11_R1.BlockPosition;
 
 
 public abstract class BlockUpdater {
 
 	//schedules a "random tick" block update
 	//see https://minecraft.gamepedia.com/Tick#Block_tick
 	static void update(Location loc){
-		net.minecraft.server.v1_10_R1.World mcWorld = ((org.bukkit.craftbukkit.v1_10_R1.CraftWorld) loc.getWorld()).getHandle();
+		net.minecraft.server.v1_11_R1.World mcWorld = ((org.bukkit.craftbukkit.v1_11_R1.CraftWorld) loc.getWorld()).getHandle();
 		BlockPosition blockPos = new BlockPosition(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ());
 		mcWorld.a(blockPos, CraftMagicNumbers.getBlock(loc.getBlock()), 1);
 	}

diff --git a/src/io/github/rypofalem/growstick/GrowStickPlugin.java b/src/io/github/rypofalem/growstick/GrowStickPlugin.java
@@ -8,6 +8,7 @@
 import org.bukkit.Effect;
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.Particle;
 import org.bukkit.Sound;
 import org.bukkit.World;
 import org.bukkit.block.Block;
@@ -44,7 +45,7 @@ void loadConfig(){
 		reloadConfig();
 		if(getConfig() == null) return;
 		doNotUpdateList = new ArrayList<Material>();
-		
+
 		if(getConfig().contains("blacklist")){
 			List<String> blacklist = getConfig().getStringList("blacklist");
 			if(blacklist != null){
@@ -58,11 +59,11 @@ void loadConfig(){
 				}
 			}
 		}
-		
+
 		if(getConfig().isDouble("baseMultiplier")){
 			baseMultiplier = (float) getConfig().getDouble("baseMultiplier");
 		}
-		
+
 		if(getConfig().isDouble("skillMultiplier")){
 			skillMultiplier = (float) getConfig().getDouble("skillMultiplier");
 		}
@@ -82,9 +83,10 @@ public void onRightClick(PlayerInteractEvent event){
 
 		int range = getRange(event.getPlayer());
 		int length= 2*range + 1;
-		float updateBase = length * length * getMultiplier(event.getPlayer());
-		int updates = (int) Math.max(1, updateBase * baseMultiplier);
-		if((updateBase - (int)(updateBase)) * baseMultiplier <= rand.nextFloat()){
+		float updateBase = length * length * getMultiplier(event.getPlayer()) * baseMultiplier;
+
+		int updates = (int) Math.max(1, updateBase);
+		if((updateBase - (int)(updateBase)) <= rand.nextFloat()){
 			//TODO: optimize so this happens 1/x times without random number generation
 			updates++; 
 		}
@@ -96,19 +98,11 @@ public void onRightClick(PlayerInteractEvent event){
 			for(int yOffset = 2; yOffset >= -1; yOffset--){
 				Block crop = world.getBlockAt(x, y + yOffset, z);
 				Material cropType = crop.getType();
-				boolean isBlacklisted = false;
-				for(Material mat : doNotUpdateList){
-					if(cropType.equals(mat)){
-						isBlacklisted = true;
-						break;
-					}
-				}
-				if(isBlacklisted) continue;
-				if(crop.getType() != Material.AIR){ //any other block is safe to schedule an update for
-					Location blockLoc = new Location(world, x + .5, y + yOffset + .99, z + .5);
-					BlockUpdater.update(blockLoc);
-					world.playEffect(blockLoc, Effect.FLYING_GLYPH, 1 );
-				}
+				if(doNotUpdateList.contains(cropType)) continue;
+				if(crop.getType() == Material.AIR) continue;
+				Location blockLoc = new Location(world, x + .5, y + yOffset + .99, z + .5);
+				BlockUpdater.update(blockLoc);
+				world.spawnParticle(Particle.ENCHANTMENT_TABLE, blockLoc, 1);
 			}
 		}