SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

Fixed entity updating

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Dinnerbone 2011-02-06 23:47:44 +00:00
Ursprung 7bdc190637
Commit e9b1607fdc
3 geänderte Dateien mit 13 neuen und 16 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

23
src/main/java/net/minecraft/server/PlayerInstance.java
Datei anzeigen

@ -17,12 +17,10 @@ class PlayerInstance {
private int k; private int k;
private int l; private int l;
private int m; private int m;
private WorldServer world; // Craftbukkit
final PlayerManager a; final PlayerManager a;
// Craftbukkit - this method signature is changed. public PlayerInstance(PlayerManager playermanager, int i, int j) {
public PlayerInstance(PlayerManager playermanager, int i, int j, WorldServer world) {
this.a = playermanager; this.a = playermanager;
this.b = new ArrayList(); this.b = new ArrayList();
this.f = new short[10]; this.f = new short[10];
@ -32,8 +30,7 @@ class PlayerInstance {
this.e = new ChunkCoordIntPair(i, j); this.e = new ChunkCoordIntPair(i, j);
// Craftbukkit start // Craftbukkit start
this.world = world; playermanager.world.A.d(i, j);
world.A.d(i, j);
// Craftbukkit end // Craftbukkit end
} }
@ -136,9 +133,9 @@ class PlayerInstance {
i = this.c * 16 + this.h; i = this.c * 16 + this.h;
j = this.j; j = this.j;
k = this.d * 16 + this.l; k = this.d * 16 + this.l;
this.a((Packet) (new Packet53BlockChange(i, j, k, world))); // Craftbukkit this.a((Packet) (new Packet53BlockChange(i, j, k, a.world))); // Craftbukkit
if (Block.p[world.getTypeId(i, j, k)]) { // Craftbukkit if (Block.p[a.world.getTypeId(i, j, k)]) { // Craftbukkit
this.a(world.getTileEntity(i, j, k)); // Craftbukkit this.a(a.world.getTileEntity(i, j, k)); // Craftbukkit
} }
} else { } else {
int l; int l;
@ -153,22 +150,22 @@ class PlayerInstance {
int i1 = this.k - this.j + 2; int i1 = this.k - this.j + 2;
int j1 = this.m - this.l + 1; int j1 = this.m - this.l + 1;
this.a((Packet) (new Packet51MapChunk(i, j, k, l, i1, j1, world))); // Craftbukkit this.a((Packet) (new Packet51MapChunk(i, j, k, l, i1, j1, a.world))); // Craftbukkit
List list = world.d(i, j, k, i + l, j + i1, k + j1); // Craftbukkit List list = a.world.d(i, j, k, i + l, j + i1, k + j1); // Craftbukkit
for (int k1 = 0; k1 < list.size(); ++k1) { for (int k1 = 0; k1 < list.size(); ++k1) {
this.a((TileEntity) list.get(k1)); this.a((TileEntity) list.get(k1));
} }
} else { } else {
this.a((Packet) (new Packet52MultiBlockChange(this.c, this.d, this.f, this.g, world))); // Craftbukkit this.a((Packet) (new Packet52MultiBlockChange(this.c, this.d, this.f, this.g, a.world))); // Craftbukkit
for (i = 0; i < this.g; ++i) { for (i = 0; i < this.g; ++i) {
j = this.c * 16 + (this.g >> 12 & 15); j = this.c * 16 + (this.g >> 12 & 15);
k = this.g & 255; k = this.g & 255;
l = this.d * 16 + (this.g >> 8 & 15); l = this.d * 16 + (this.g >> 8 & 15);
if (Block.p[world.getTypeId(j, k, l)]) { // Craftbukkit if (Block.p[a.world.getTypeId(j, k, l)]) { // Craftbukkit
System.out.println("Sending!"); System.out.println("Sending!");
this.a(world.getTileEntity(j, k, l)); // Craftbukkit this.a(a.world.getTileEntity(j, k, l)); // Craftbukkit
} }
} }
} }

4
src/main/java/net/minecraft/server/PlayerManager.java
Datei anzeigen

@ -9,7 +9,7 @@ public class PlayerManager {
private PlayerList b = new PlayerList(); private PlayerList b = new PlayerList();
private List c = new ArrayList(); private List c = new ArrayList();
private MinecraftServer d; private MinecraftServer d;
private WorldServer world; // Craftbukkit public WorldServer world; // Craftbukkit
// Craftbukkit - change of method signature // Craftbukkit - change of method signature
public PlayerManager(MinecraftServer minecraftserver, WorldServer world) { public PlayerManager(MinecraftServer minecraftserver, WorldServer world) {
@ -32,7 +32,7 @@ public class PlayerManager {
PlayerInstance playerinstance = (PlayerInstance) this.b.a(k); PlayerInstance playerinstance = (PlayerInstance) this.b.a(k);
if (playerinstance == null && flag) { if (playerinstance == null && flag) {
playerinstance = new PlayerInstance(this, i, j, world); playerinstance = new PlayerInstance(this, i, j);
this.b.a(k, playerinstance); this.b.a(k, playerinstance);
} }

2
src/main/java/net/minecraft/server/ServerConfigurationManager.java
Datei anzeigen

@ -92,7 +92,7 @@ public class ServerConfigurationManager {
} }
public void b(EntityPlayer entityplayer) { public void b(EntityPlayer entityplayer) {
((WorldServer)entityplayer.world).c(entityplayer); // Craftbukkit ((WorldServer)entityplayer.world).manager.c(entityplayer); // Craftbukkit
} }
public void c(EntityPlayer entityplayer) { public void c(EntityPlayer entityplayer) {