From 5c467e941bc2f08a615288c378e756f00f4321ef Mon Sep 17 00:00:00 2001 From: Erik Broes Date: Tue, 1 Feb 2011 21:40:52 +0100 Subject: [PATCH] Actually implement the spiral stuff now, oops --- .../net/minecraft/server/PlayerManager.java | 40 +++++++++++++++++-- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraft/server/PlayerManager.java b/src/main/java/net/minecraft/server/PlayerManager.java index 7fac33b3d7..f2ace21e0c 100644 --- a/src/main/java/net/minecraft/server/PlayerManager.java +++ b/src/main/java/net/minecraft/server/PlayerManager.java @@ -44,6 +44,15 @@ public class PlayerManager { } } + // CraftBukkit start + private final int[][] direction = new int[][] { + { 1, 0 }, + { 0, 1 }, + { -1, 0 }, + { 0, -1 }, + }; + // CraftBukkit end + public void a(EntityPlayer entityplayer) { int i = (int) entityplayer.locX >> 4; int j = (int) entityplayer.locZ >> 4; @@ -51,12 +60,37 @@ public class PlayerManager { entityplayer.d = entityplayer.locX; entityplayer.e = entityplayer.locZ; - for (int k = i - 10; k <= i + 10; ++k) { - for (int l = j - 10; l <= j + 10; ++l) { - this.a(k, l, true).a(entityplayer); + // CraftBukkit start + int facing = 0; + int size = 10; + int dx = 0; + int dz = 0; + + // Origin + this.a(i, j, true).a(entityplayer); + + // All but the last leg + for (int legSize = 1; legSize <= size * 2; legSize++) { + for (int leg = 0; leg < 2; leg++) { + int[] dir = direction[ facing++ % 4 ]; + + for (int k = 0; k < legSize; k++ ) { + dx += dir[0]; + dz += dir[1]; + this.a(i + dx, j + dz, true).a(entityplayer); + } } } + // Final leg + facing %= 4; + for (int k = 0; k < size * 2; k++) { + dx += direction[facing][0]; + dz += direction[facing][1]; + this.a(i + dx, j + dz, true).a(entityplayer); + } + // CraftBukkit end + this.a.add(entityplayer); }