Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 19:15:32 +01:00
Code Issues Projects Releases Wiki Activity

Fix missed diff and other small things

Browse Source
This commit is contained in:
Travis Watkins 2014-04-13 04:29:01 -05:00
parent d82e34da59
commit 3dcf159ec1
8 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minecraft/server/EntityEnderDragon.java
View File

@ -135,7 +135,7 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
d2 = this.locZ + (this.bj - this.locZ) / (double) this.bg;
d3 = MathHelper.g(this.bk - (double) this.yaw);
this.yaw = (float) ((double) this.yaw + d3 / (double) this.bg);
this.pitch = (float) ((double) this.pitch + (this.bm - (double) this.pitch) / (double) this.bg);
this.pitch = (float) ((double) this.pitch + (this.bl - (double) this.pitch) / (double) this.bg);
--this.bg;
this.setPosition(d0, d1, d2);
this.b(this.yaw, this.pitch);

6
src/main/java/net/minecraft/server/EntityHuman.java
View File

@ -78,7 +78,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
ChunkCoordinates chunkcoordinates = world.getSpawn();
this.setPositionRotation((double) chunkcoordinates.x + 0.5D, (double) (chunkcoordinates.y + 1), (double) chunkcoordinates.z + 0.5D, 0.0F, 0.0F);
this.az = 180.0F;
this.aZ = 180.0F;
this.maxFireTicks = 20;
}
@ -190,7 +190,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
}
if (d0 < -d3) {
this.bu = this.by = this.locX;
this.bu = this.bx = this.locX;
}
if (d2 < -d3) {
@ -198,7 +198,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
}
if (d1 < -d3) {
this.bv = this.bz = this.locY;
this.bv = this.by = this.locY;
}
this.bx += d0 * 0.25D;

2
src/main/java/net/minecraft/server/EntityMinecartAbstract.java
View File

@ -199,7 +199,7 @@ public abstract class EntityMinecartAbstract extends Entity {
}
if (this.locY < -64.0D) {
this.G();
this.F();
}
int i;

2
src/main/java/net/minecraft/server/EntitySlime.java
View File

@ -146,7 +146,7 @@ public class EntitySlime extends EntityInsentient implements IMonster {
} else {
this.bc = false;
if (this.onGround) {
this.bd = this.bf = 0.0F;
this.bd = this.be = 0.0F;
}
}
}

2
src/main/java/net/minecraft/server/PlayerConnection.java
View File

@ -341,7 +341,7 @@ public class PlayerConnection implements PacketPlayInListener {
}
this.player.i();
this.player.W = 0.0F;
this.player.V = 0.0F;
this.player.setLocation(this.y, this.z, this.q, f2, f3);
if (!this.checkMovement) {
return;

8
src/main/java/net/minecraft/server/PlayerList.java
View File

@ -164,7 +164,7 @@ public abstract class PlayerList {
}
// CraftBukkit - Moved from above, added world
g.info(entityplayer.getName() + "[" + s + "] logged in with entity id " + entityplayer.getId() + " at ([" + entityplayer.world.worldData.getName() + "] " + entityplayer.locX + ", " + entityplayer.locY + ", " + entityplayer.locZ + ")");
g.info(entityplayer.getName() + "[" + s1 + "] logged in with entity id " + entityplayer.getId() + " at ([" + entityplayer.world.worldData.getName() + "] " + entityplayer.locX + ", " + entityplayer.locY + ", " + entityplayer.locZ + ")");
}
public void a(ScoreboardServer scoreboardserver, EntityPlayer entityplayer) { // CraftBukkit - protected -> public
@ -374,7 +374,7 @@ public abstract class PlayerList {
s = s + "\nYour ban will be removed on " + h.format(ipbanentry.getExpires());
}
// return s2;
// return s;
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s);
} else {
// return this.players.size() >= this.maxPlayers ? "The server is full!" : null;
@ -768,7 +768,7 @@ public abstract class PlayerList {
*/
if (entity.isAlive()) {
// entity.setPositionRotation(d0, entity.locY, d1, entity.yaw, entity.pitch)
// worldserver1.s().a(entity, d3, d4, d5, f);
// worldserver1.getTravelAgent().a(entity, d3, d4, d5, f);
if (portal) {
Vector velocity = entity.getBukkitEntity().getVelocity();
worldserver1.getTravelAgent().adjustExit(entity, exit, velocity);
@ -794,7 +794,7 @@ public abstract class PlayerList {
}
/* CraftBukkit start - Remove updating of lag to players -- it spams way to much on big servers.
if (this.p < this.players.size()) {
if (this.t < this.players.size()) {
EntityPlayer entityplayer = (EntityPlayer) this.players.get(this.p);
this.sendAll(new PacketPlayOutPlayerInfo(entityplayer.getName(), true, entityplayer.ping));

6
src/main/java/net/minecraft/server/WorldNBTStorage.java
View File

@ -208,7 +208,11 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData {
// CraftBukkit start
if (entityhuman instanceof EntityPlayer) {
CraftPlayer player = (CraftPlayer) entityhuman.bukkitEntity;
player.setFirstPlayed(new File(playerDir, entityhuman.getName() + ".dat").lastModified());
// Only update first played if it is older than the one we have
long modified = new File(this.playerDir, entityhuman.getUniqueID().toString() + ".dat").lastModified();
if (modified < player.getFirstPlayed()) {
player.setFirstPlayed(modified);
}
}
// CraftBukkit end

2
src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
View File

@ -163,7 +163,7 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
@Override
public int hashCode() {
int hash = 5;
hash = 97 * hash + (this.getUniqueId() != null ? this.getUniqueId().toString().hashCode() : 0);
hash = 97 * hash + (this.getUniqueId() != null ? this.getUniqueId().hashCode() : 0);
return hash;
}