Updated to use mc-dev rename revision 1

This commit is contained in:
Nathan Adams
2011-11-29 23:17:43 +00:00
parent 8665161eaa
commit 8fbe78a2c3
117 changed files with 907 additions and 1161 deletions

View File

@@ -30,7 +30,7 @@ public class EntitySmallFireball extends EntityFireball {
// CraftBukkit end
if (movingobjectposition.entity != null) {
// CraftBukkit start - entity damage by entity event + combust event
if (!movingobjectposition.entity.ax()) { // check if not fireproof
if (!movingobjectposition.entity.isFireproof()) { // check if not fireproof
boolean stick;
org.bukkit.entity.Entity damagee = movingobjectposition.entity.getBukkitEntity();
Projectile projectile = (Projectile) this.getBukkitEntity();
@@ -54,7 +54,7 @@ public class EntitySmallFireball extends EntityFireball {
pluginManager.callEvent(combustEvent);
if (!combustEvent.isCancelled()) {
movingobjectposition.entity.j(combustEvent.getDuration());
movingobjectposition.entity.setOnFire(combustEvent.getDuration());
}
}
// CraftBukkit end