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

Cleanup.

Browse Source
This commit is contained in:
EvilSeph 2012-01-27 18:23:16 -05:00
parent 38ad0ea5fd
commit bb730f0ee7
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/minecraft/server/EntityLiving.java
View File

@ -823,6 +823,7 @@ public abstract class EntityLiving extends Entity {
}
public void b(NBTTagCompound nbttagcompound) {
if (this.health < Short.MIN_VALUE) this.health = Short.MIN_VALUE; // CraftBukkit
nbttagcompound.setShort("Health", (short) this.health);
nbttagcompound.setShort("HurtTime", (short) this.hurtTicks);
nbttagcompound.setShort("DeathTime", (short) this.deathTicks);

4
src/main/java/net/minecraft/server/EntitySnowman.java
View File

@ -1,11 +1,11 @@
package net.minecraft.server;
import java.util.List;
// Craftbukkit start
// CraftBukkit start
import org.bukkit.block.BlockState;
import org.bukkit.craftbukkit.event.CraftEventFactory;
import org.bukkit.event.block.EntityBlockFormEvent;
// Craftbukkit end
// CraftBukkit end
public class EntitySnowman extends EntityGolem {

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

@ -88,7 +88,7 @@ import org.yaml.snakeyaml.constructor.SafeConstructor;
import org.yaml.snakeyaml.error.MarkedYAMLException;
public final class CraftServer implements Server {
private final String serverName = "Craftbukkit";
private final String serverName = "CraftBukkit";
private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion();
private final ServicesManager servicesManager = new SimpleServicesManager();