SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated to use mc-dev rename revision 1

Browse Source 
By: Nathan Adams <dinnerbone@dinnerbone.com>
This commit is contained in:
CraftBukkit/Spigot
2011-11-29 23:17:43 +00:00
parent 540f893f86
commit 0939b7a7f9
17 changed files with 69 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
View File

@@ -81,7 +81,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
}
// Slimes are a special (and broken) case
else if (entity instanceof EntitySlime) {
if (entity instanceof EntityLavaSlime) { return new CraftMagmaCube(server, (EntityLavaSlime) entity); }
if (entity instanceof EntityMagmaCube) { return new CraftMagmaCube(server, (EntityMagmaCube) entity); }
else { return new CraftSlime(server, (EntitySlime) entity); }
}
// Flying
@@ -108,7 +108,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
else if (entity instanceof EntityPotion) { return new CraftThrownPotion(server, (EntityPotion) entity); }
else if (entity instanceof EntityEnderPearl) { return new CraftEnderPearl(server, (EntityEnderPearl) entity); }
}
else if (entity instanceof EntityFallingSand) { return new CraftFallingSand(server, (EntityFallingSand) entity); }
else if (entity instanceof EntityFallingBlock) { return new CraftFallingSand(server, (EntityFallingBlock) entity); }
else if (entity instanceof EntityFireball) {
if (entity instanceof EntitySmallFireball) { return new CraftSmallFireball(server, (EntitySmallFireball) entity); }
else { return new CraftFireball(server, (EntityFireball) entity); }
@@ -118,7 +118,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
else if (entity instanceof EntityFishingHook) { return new CraftFish(server, (EntityFishingHook) entity); }
else if (entity instanceof EntityItem) { return new CraftItem(server, (EntityItem) entity); }
else if (entity instanceof EntityWeather) {
if (entity instanceof EntityWeatherStorm) { return new CraftLightningStrike(server, (EntityWeatherStorm) entity); }
if (entity instanceof EntityWeatherLighting) { return new CraftLightningStrike(server, (EntityWeatherLighting) entity); }
else { return new CraftWeather(server, (EntityWeather) entity); }
}
else if (entity instanceof EntityMinecart) {
@@ -195,7 +195,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
}
public boolean isDead() {
return !entity.aj();
return !entity.isAlive();
}
@Override

8
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingSand.java
View File

@@ -1,6 +1,6 @@
package org.bukkit.craftbukkit.entity;
import net.minecraft.server.EntityFallingSand;
import net.minecraft.server.EntityFallingBlock;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftEntity;
@@ -8,13 +8,13 @@ import org.bukkit.entity.FallingSand;
public class CraftFallingSand extends CraftEntity implements FallingSand {
public CraftFallingSand(CraftServer server, EntityFallingSand entity) {
public CraftFallingSand(CraftServer server, EntityFallingBlock entity) {
super(server, entity);
}
@Override
public EntityFallingSand getHandle() {
return (EntityFallingSand) entity;
public EntityFallingBlock getHandle() {
return (EntityFallingBlock) entity;
}
@Override

10
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
View File

@@ -1,21 +1,21 @@
package org.bukkit.craftbukkit.entity;
import net.minecraft.server.EntityWeatherStorm;
import net.minecraft.server.EntityWeatherLighting;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.LightningStrike;
public class CraftLightningStrike extends CraftEntity implements LightningStrike {
public CraftLightningStrike(final CraftServer server, final EntityWeatherStorm entity) {
public CraftLightningStrike(final CraftServer server, final EntityWeatherLighting entity) {
super(server, entity);
}
public boolean isEffect() {
return ((EntityWeatherStorm) super.getHandle()).isEffect;
return ((EntityWeatherLighting) super.getHandle()).isEffect;
}
@Override
public EntityWeatherStorm getHandle() {
return (EntityWeatherStorm) entity;
public EntityWeatherLighting getHandle() {
return (EntityWeatherLighting) entity;
}
@Override

4
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
View File

@@ -149,11 +149,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
}
public int getRemainingAir() {
return getHandle().airTicks;
return getHandle().getAirTicks();
}
public void setRemainingAir(int ticks) {
getHandle().airTicks = ticks;
getHandle().setAirTicks(ticks);
}
public int getMaximumAir() {

8
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMagmaCube.java
View File

@@ -1,18 +1,18 @@
package org.bukkit.craftbukkit.entity;
import net.minecraft.server.EntityLavaSlime;
import net.minecraft.server.EntityMagmaCube;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.MagmaCube;
public class CraftMagmaCube extends CraftSlime implements MagmaCube {
public CraftMagmaCube(CraftServer server, EntityLavaSlime entity) {
public CraftMagmaCube(CraftServer server, EntityMagmaCube entity) {
super(server, entity);
}
public EntityLavaSlime getHandle() {
return (EntityLavaSlime) entity;
public EntityMagmaCube getHandle() {
return (EntityMagmaCube) entity;
}
@Override

20
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@@ -6,14 +6,14 @@ import java.util.LinkedHashMap;
import java.util.Map;
import net.minecraft.server.EntityHuman;
import net.minecraft.server.EntityPlayer;
import net.minecraft.server.Packet131;
import net.minecraft.server.Packet131ItemData;
import net.minecraft.server.Packet200Statistic;
import net.minecraft.server.Packet201PlayerInfo;
import net.minecraft.server.Packet3Chat;
import net.minecraft.server.Packet51MapChunk;
import net.minecraft.server.Packet53BlockChange;
import net.minecraft.server.Packet54PlayNoteBlock;
import net.minecraft.server.Packet61;
import net.minecraft.server.Packet61WorldEvent;
import net.minecraft.server.Packet6SpawnPosition;
import net.minecraft.server.Packet70Bed;
import net.minecraft.server.WorldServer;
@@ -211,7 +211,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (getHandle().netServerHandler == null) return;
int packetData = effect.getId();
Packet61 packet = new Packet61(packetData, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ(), data);
Packet61WorldEvent packet = new Packet61WorldEvent(packetData, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ(), data);
getHandle().netServerHandler.sendPacket(packet);
}
@@ -268,7 +268,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
for (int y = 0; y < 128; ++y) {
bytes[y + 3] = data.buffer[y * 128 + x];
}
Packet131 packet = new Packet131((short) Material.MAP.getId(), map.getId(), bytes);
Packet131ItemData packet = new Packet131ItemData((short) Material.MAP.getId(), map.getId(), bytes);
getHandle().netServerHandler.sendPacket(packet);
}
}
@@ -459,7 +459,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public int getExperience() {
return getHandle().exp;
return getHandle().expTotal;
}
public void setExperience(int exp) {
@@ -467,22 +467,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public int getLevel() {
return (int)getHandle().expLevel;
return (int)getHandle().exp;
}
public void setLevel(int level) {
getHandle().expLevel = level;
getHandle().exp = level;
}
public int getTotalExperience() {
return getHandle().expTotal;
return getHandle().expLevel;
}
public void setTotalExperience(int exp) {
getHandle().expTotal = exp;
getHandle().expLevel = exp;
if (getTotalExperience() > getExperience()) {
getHandle().exp = getTotalExperience();
getHandle().expTotal = getTotalExperience();
}
}