Fix issue #746 (#760)

Author: Litorom

src/client/java/minicraft/entity/particle/WaterParticle.java

@@ -5,51 +5,32 @@
 public class WaterParticle extends Particle {
 	private final int destX;
 	private final int destY;
-	private int count;
 	private boolean stopped;
+	private int stepCounter;
 
 	public WaterParticle(int x, int y, int lifetime, SpriteLinker.LinkedSprite sprite, int destX, int destY) {
 		super(x, y, lifetime, sprite);
 		this.destX = destX;
 		this.destY = destY;
-		count = 0;
-		stopped = false;
+		this.stopped = false;
+		this.stepCounter = 0;
 	}
 
 	@Override
 	public void tick() {
-		move:
 		if (!stopped) {
-			count++;
+			stepCounter++;
+
 			if (x == destX && y == destY) {
 				stopped = true;
-				break move;
-			}
-			if (count == 2) {
-				int diffX = destX - x;
-				int diffY = destY - y;
-				if (Math.abs(diffX) < 3 && Math.abs(diffY) < 3) {
-					move(destX, destY);
-					stopped = true;
-					break move;
-				}
+			} else if (stepCounter % 2 == 0) {
+				int dx = Integer.compare(destX, x);
+				int dy = Integer.compare(destY, y);
+				move(dx, dy);
 
-				double phi = Math.atan2(diffY, diffX);
-				double moveX = Math.cos(phi);
-				double moveY = Math.sin(phi);
-				int moveXI = 0;
-				int moveYI = 0;
-				if (Math.abs(moveX / moveY) > 1.4) moveXI = (int) Math.signum(moveX); // Difference in X is greater.
-				else if (Math.abs(moveY / moveX) > 1.4)
-					moveYI = (int) Math.signum(moveY); // Difference in Y is greater.
-				else { // The difference is small.
-					moveXI = (int) Math.signum(moveX);
-					moveYI = (int) Math.signum(moveY);
-				}
-
-				if (!move(moveXI, moveYI))
+				if (x == destX && y == destY) {
 					stopped = true;
-				count = 0;
+				}
 			}
 		}
 

src/client/java/minicraft/item/WateringCanItem.java

@@ -7,8 +7,8 @@
 import minicraft.gfx.Point;
 import minicraft.gfx.SpriteLinker;
 import minicraft.level.Level;
-import minicraft.level.tile.DirtTile;
 import minicraft.level.tile.FlowerTile;
+import minicraft.level.tile.DirtTile;
 import minicraft.level.tile.GrassTile;
 import minicraft.level.tile.Tile;
 import minicraft.level.tile.Tiles;
@@ -65,8 +65,8 @@ public boolean interactOn(Tile tile, Level level, int xt, int yt, Player player,
 					int x = player.x - 2 + 4 * attackDir.getX() + random.nextInt(5) - 2;
 					int y = player.y - 2 + 4 * attackDir.getY() + random.nextInt(5) - 2;
 					level.add(new WaterParticle(x, y, 80 + random.nextInt(61) - 30, splash, destX, destY));
-					renderingTick = 0;
 				}
+				renderingTick = 0;
 			}
 			if (tile instanceof CropTile) {
 				int fertilization = ((CropTile) tile).getFertilization(level.getData(xt, yt));
@@ -87,7 +87,7 @@ public boolean interactOn(Tile tile, Level level, int xt, int yt, Player player,
 					}
 					if (random.nextInt(60) == 0) { // Small chance for growing flowers
 						level.setTile(xt, yt, Tiles.get((short) 2),
-							random.nextInt(FlowerTile.FlowerVariant.values().length));
+						random.nextInt(FlowerTile.FlowerVariant.values().length));
 					}
 				}