summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/PlayerManager.java
diff options
context:
space:
mode:
authorDinnerbone <dinnerbone@dinnerbone.com>2011-02-28 20:30:33 +0000
committerDinnerbone <dinnerbone@dinnerbone.com>2011-02-28 20:30:33 +0000
commitd142fabfc1d1c894a5f40dd5d516d928628dbade (patch)
tree245b8225b1e08cf47e08d38f230379bd49733334 /src/main/java/net/minecraft/server/PlayerManager.java
parent5f20de34a945cc18ef155db0fb0622cd8af4e3c3 (diff)
downloadcraftbukkit-d142fabfc1d1c894a5f40dd5d516d928628dbade.tar
craftbukkit-d142fabfc1d1c894a5f40dd5d516d928628dbade.tar.gz
craftbukkit-d142fabfc1d1c894a5f40dd5d516d928628dbade.tar.lz
craftbukkit-d142fabfc1d1c894a5f40dd5d516d928628dbade.tar.xz
craftbukkit-d142fabfc1d1c894a5f40dd5d516d928628dbade.zip
Sped up teleporting even more, + fixed isSneaking
Diffstat (limited to 'src/main/java/net/minecraft/server/PlayerManager.java')
-rw-r--r--src/main/java/net/minecraft/server/PlayerManager.java19
1 files changed, 4 insertions, 15 deletions
diff --git a/src/main/java/net/minecraft/server/PlayerManager.java b/src/main/java/net/minecraft/server/PlayerManager.java
index 12f0dddd..4083dcf6 100644
--- a/src/main/java/net/minecraft/server/PlayerManager.java
+++ b/src/main/java/net/minecraft/server/PlayerManager.java
@@ -127,27 +127,16 @@ public class PlayerManager {
int j1 = j - l;
// Craftbukkit start
- if (!this.a(i, j, k, l)) {
- this.a(i, j, true).a(entityplayer);
- }
-
- if (!this.a(i - i1, j - j1, i, j)) {
- PlayerInstance playerinstance = this.a(i - i1, j - j1, false);
-
- if (playerinstance != null) {
- playerinstance.b(entityplayer);
- }
+ if (i1 > 10 || i1 < -10 || j1 > 10 || j1 < -10) {
+ b(entityplayer);
+ a(entityplayer);
+ return;
}
// Craftbukkit end
if (i1 != 0 || j1 != 0) {
for (int k1 = i - 10; k1 <= i + 10; ++k1) {
for (int l1 = j - 10; l1 <= j + 10; ++l1) {
- // Craftbukkit start
- if ((k1 == i) && (l1 == j)) {
- continue;
- }
- // Craftbukkit end
if (!this.a(k1, l1, k, l)) {
this.a(k1, l1, true).a(entityplayer);
}