properly fix #473

This commit is contained in:
Jesse Boyd 2017-06-03 18:18:50 +10:00
parent 1722daa3b3
commit 8b9c1b7563
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
7 changed files with 14 additions and 19 deletions

View File

@ -476,8 +476,8 @@ public class BukkitChunk_1_10 extends CharFaweChunk<Chunk, BukkitQueue_1_10> {
if (tileEntity != null) {
net.minecraft.server.v1_10_R1.NBTTagCompound tag = (net.minecraft.server.v1_10_R1.NBTTagCompound) com.boydti.fawe.bukkit.v1_10.BukkitQueue_1_10.methodFromNative.invoke(com.boydti.fawe.bukkit.v1_10.BukkitQueue_1_10.adapter, nativeTag);
tag.set("x", new NBTTagInt(x));
tag.set("y", new NBTTagInt(x));
tag.set("z", new NBTTagInt(x));
tag.set("y", new NBTTagInt(y));
tag.set("z", new NBTTagInt(z));
tileEntity.a(tag); // ReadTagIntoTile
}
}

View File

@ -486,8 +486,8 @@ public class BukkitChunk_1_11 extends CharFaweChunk<Chunk, com.boydti.fawe.bukki
if (tileEntity != null) {
NBTTagCompound tag = (NBTTagCompound) com.boydti.fawe.bukkit.v1_11.BukkitQueue_1_11.methodFromNative.invoke(com.boydti.fawe.bukkit.v1_11.BukkitQueue_1_11.adapter, nativeTag);
tag.set("x", new NBTTagInt(x));
tag.set("y", new NBTTagInt(x));
tag.set("z", new NBTTagInt(x));
tag.set("y", new NBTTagInt(y));
tag.set("z", new NBTTagInt(z));
tileEntity.a(tag); // ReadTagIntoTile
}
}

View File

@ -486,8 +486,8 @@ public class BukkitChunk_1_12 extends CharFaweChunk<Chunk, BukkitQueue_1_12> {
if (tileEntity != null) {
NBTTagCompound tag = (NBTTagCompound) BukkitQueue_1_12.methodFromNative.invoke(BukkitQueue_1_12.adapter, nativeTag);
tag.set("x", new NBTTagInt(x));
tag.set("y", new NBTTagInt(x));
tag.set("z", new NBTTagInt(x));
tag.set("y", new NBTTagInt(y));
tag.set("z", new NBTTagInt(z));
tileEntity.a(tag); // ReadTagIntoTile
}
}

View File

@ -396,8 +396,8 @@ public class BukkitChunk_1_7 extends CharFaweChunk<Chunk, BukkitQueue17> {
if (tileEntity != null) {
NBTTagCompound tag = (NBTTagCompound) BukkitQueue17.methodFromNative.invoke(BukkitQueue17.adapter, nativeTag);
tag.set("x", new NBTTagInt(x));
tag.set("y", new NBTTagInt(x));
tag.set("z", new NBTTagInt(x));
tag.set("y", new NBTTagInt(y));
tag.set("z", new NBTTagInt(z));
tileEntity.a(tag); // ReadTagIntoTile
}
}

View File

@ -309,8 +309,8 @@ public class BukkitChunk_1_8 extends CharFaweChunk<Chunk, BukkitQueue18R3> {
if (tileEntity != null) {
NBTTagCompound tag = (NBTTagCompound) BukkitQueue18R3.methodFromNative.invoke(BukkitQueue18R3.adapter, nativeTag);
tag.set("x", new NBTTagInt(x));
tag.set("y", new NBTTagInt(x));
tag.set("z", new NBTTagInt(x));
tag.set("y", new NBTTagInt(y));
tag.set("z", new NBTTagInt(z));
tileEntity.a(tag); // ReadTagIntoTile
}
}

View File

@ -428,8 +428,8 @@ public class BukkitChunk_1_9 extends CharFaweChunk<Chunk, BukkitQueue_1_9_R1> {
if (tileEntity != null) {
NBTTagCompound tag = (NBTTagCompound) BukkitQueue_1_9_R1.methodFromNative.invoke(BukkitQueue_1_9_R1.adapter, nativeTag);
tag.set("x", new NBTTagInt(x));
tag.set("y", new NBTTagInt(x));
tag.set("z", new NBTTagInt(x));
tag.set("y", new NBTTagInt(y));
tag.set("z", new NBTTagInt(z));
tileEntity.a(tag); // ReadTagIntoTile
}
}

View File

@ -9,14 +9,9 @@ public class IntegerPair {
this.z = z;
}
int hash;
@Override
public int hashCode() {
if (hash == 0) {
this.hash = (x << 16) | (z & 0xFFFF);
}
return this.hash;
return (x << 16) | (z & 0xFFFF);
}
@Override
@ -29,7 +24,7 @@ public class IntegerPair {
if (this == obj) {
return true;
}
if ((obj == null) || (this.hashCode() != obj.hashCode()) || (this.getClass() != obj.getClass())) {
if ((obj == null) || (this.getClass() != obj.getClass())) {
return false;
}
final IntegerPair other = (IntegerPair) obj;