@@ -619,17 +619,8 @@
|
||||
+
|
||||
public void f(EntityPlayer entityplayer) {
|
||||
GameProfile gameprofile = entityplayer.getProfile();
|
||||
int i = this.isOp(gameprofile) ? this.operators.a(gameprofile) : 0;
|
||||
@@ -470,7 +771,7 @@
|
||||
boolean flag1 = flag && this.server.I().equalsIgnoreCase(entityplayer.getProfile().getName());
|
||||
int j = flag1 ? 4 : 2;
|
||||
|
||||
- i = flag && this.server.worldServer[0].getWorldData().u() ? j : i;
|
||||
+ i = flag && this.server.worlds.get(0).getWorldData().u() ? j : i; // CraftBukkit
|
||||
i = this.u ? j : i;
|
||||
this.b(entityplayer, i);
|
||||
}
|
||||
@@ -504,12 +805,111 @@
|
||||
int i = this.server.a(gameprofile);
|
||||
@@ -499,12 +800,111 @@
|
||||
}
|
||||
|
||||
public void changeWorld(Entity entity, int i, WorldServer worldserver, WorldServer worldserver1) {
|
||||
@@ -741,7 +732,7 @@
|
||||
if (entity.dimension == -1) {
|
||||
d0 = MathHelper.a(d0 / 8.0D, worldserver1.getWorldBorder().b() + 16.0D, worldserver1.getWorldBorder().d() - 16.0D);
|
||||
d1 = MathHelper.a(d1 / 8.0D, worldserver1.getWorldBorder().c() + 16.0D, worldserver1.getWorldBorder().e() - 16.0D);
|
||||
@@ -528,6 +928,8 @@
|
||||
@@ -523,6 +923,8 @@
|
||||
BlockPosition blockposition;
|
||||
|
||||
if (i == 1) {
|
||||
@@ -750,7 +741,7 @@
|
||||
blockposition = worldserver1.getSpawn();
|
||||
} else {
|
||||
blockposition = worldserver1.getDimensionSpawn();
|
||||
@@ -541,16 +943,27 @@
|
||||
@@ -536,16 +938,27 @@
|
||||
worldserver.entityJoinedWorld(entity, false);
|
||||
}
|
||||
}
|
||||
@@ -781,7 +772,7 @@
|
||||
worldserver1.entityJoinedWorld(entity, false);
|
||||
}
|
||||
|
||||
@@ -558,11 +971,23 @@
|
||||
@@ -553,11 +966,23 @@
|
||||
}
|
||||
|
||||
entity.spawnIn(worldserver1);
|
||||
@@ -806,7 +797,7 @@
|
||||
this.v = 0;
|
||||
}
|
||||
|
||||
@@ -575,6 +1000,25 @@
|
||||
@@ -570,6 +995,25 @@
|
||||
|
||||
}
|
||||
|
||||
@@ -832,7 +823,7 @@
|
||||
public void a(Packet<?> packet, int i) {
|
||||
for (int j = 0; j < this.players.size(); ++j) {
|
||||
EntityPlayer entityplayer = (EntityPlayer) this.players.get(j);
|
||||
@@ -677,6 +1121,7 @@
|
||||
@@ -670,6 +1114,7 @@
|
||||
entityplayer.playerConnection.sendPacket(new PacketPlayOutEntityStatus(entityplayer, b0));
|
||||
}
|
||||
|
||||
@@ -840,7 +831,7 @@
|
||||
this.server.getCommandDispatcher().a(entityplayer);
|
||||
}
|
||||
|
||||
@@ -685,7 +1130,7 @@
|
||||
@@ -678,7 +1123,7 @@
|
||||
}
|
||||
|
||||
public boolean isOp(GameProfile gameprofile) {
|
||||
@@ -849,7 +840,7 @@
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@@ -709,6 +1154,12 @@
|
||||
@@ -702,6 +1147,12 @@
|
||||
for (int j = 0; j < this.players.size(); ++j) {
|
||||
EntityPlayer entityplayer = (EntityPlayer) this.players.get(j);
|
||||
|
||||
@@ -862,7 +853,7 @@
|
||||
if (entityplayer != entityhuman && entityplayer.dimension == i) {
|
||||
double d4 = d0 - entityplayer.locX;
|
||||
double d5 = d1 - entityplayer.locY;
|
||||
@@ -748,7 +1199,7 @@
|
||||
@@ -741,7 +1192,7 @@
|
||||
public void reloadWhitelist() {}
|
||||
|
||||
public void b(EntityPlayer entityplayer, WorldServer worldserver) {
|
||||
@@ -871,7 +862,7 @@
|
||||
|
||||
entityplayer.playerConnection.sendPacket(new PacketPlayOutWorldBorder(worldborder, PacketPlayOutWorldBorder.EnumWorldBorderAction.INITIALIZE));
|
||||
entityplayer.playerConnection.sendPacket(new PacketPlayOutUpdateTime(worldserver.getTime(), worldserver.getDayTime(), worldserver.getGameRules().getBoolean("doDaylightCycle")));
|
||||
@@ -756,16 +1207,21 @@
|
||||
@@ -749,16 +1200,21 @@
|
||||
|
||||
entityplayer.playerConnection.sendPacket(new PacketPlayOutSpawnPosition(blockposition));
|
||||
if (worldserver.isRaining()) {
|
||||
@@ -897,7 +888,7 @@
|
||||
entityplayer.playerConnection.sendPacket(new PacketPlayOutHeldItemSlot(entityplayer.inventory.itemInHandIndex));
|
||||
}
|
||||
|
||||
@@ -778,7 +1234,7 @@
|
||||
@@ -771,7 +1227,7 @@
|
||||
}
|
||||
|
||||
public String[] getSeenPlayers() {
|
||||
@@ -906,7 +897,7 @@
|
||||
}
|
||||
|
||||
public boolean getHasWhitelist() {
|
||||
@@ -827,26 +1283,39 @@
|
||||
@@ -820,26 +1276,39 @@
|
||||
}
|
||||
|
||||
public void u() {
|
||||
@@ -951,7 +942,7 @@
|
||||
|
||||
if (serverstatisticmanager == null) {
|
||||
File file = new File(this.server.a(DimensionManager.OVERWORLD).getDataManager().getDirectory(), "stats");
|
||||
@@ -861,7 +1330,7 @@
|
||||
@@ -854,7 +1323,7 @@
|
||||
}
|
||||
|
||||
serverstatisticmanager = new ServerStatisticManager(this.server, file1);
|
||||
@@ -960,7 +951,7 @@
|
||||
}
|
||||
|
||||
return serverstatisticmanager;
|
||||
@@ -869,14 +1338,14 @@
|
||||
@@ -862,14 +1331,14 @@
|
||||
|
||||
public AdvancementDataPlayer h(EntityPlayer entityplayer) {
|
||||
UUID uuid = entityplayer.getUniqueID();
|
||||
@@ -977,7 +968,7 @@
|
||||
}
|
||||
|
||||
advancementdataplayer.a(entityplayer);
|
||||
@@ -889,8 +1358,10 @@
|
||||
@@ -882,8 +1351,10 @@
|
||||
WorldServer[] aworldserver = this.server.worldServer;
|
||||
int j = aworldserver.length;
|
||||
|
||||
@@ -990,7 +981,7 @@
|
||||
|
||||
if (worldserver != null) {
|
||||
worldserver.getPlayerChunkMap().a(i);
|
||||
@@ -915,13 +1386,20 @@
|
||||
@@ -908,13 +1379,20 @@
|
||||
}
|
||||
|
||||
public void reload() {
|
||||
|
||||
Reference in New Issue
Block a user