summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityFireball.java
diff options
context:
space:
mode:
authorNathan Adams <dinnerbone@dinnerbone.com>2012-03-22 20:39:39 +0000
committerNathan Adams <dinnerbone@dinnerbone.com>2012-03-22 20:39:39 +0000
commit9d09e7d0167326d4169f734e4b6d04c54d767507 (patch)
tree898333912891b9c35a63994242fbd55d5b6ac2c6 /src/main/java/net/minecraft/server/EntityFireball.java
parent8dc7417a3d5c1af1e6434dc54952cfd5a8e90688 (diff)
downloadcraftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar
craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar.gz
craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar.lz
craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar.xz
craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.zip
Updated to Minecraft version 1.2.4. Updated version string to 1.2.4-R0.1.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityFireball.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityFireball.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java
index b4616af8..ec4911ea 100644
--- a/src/main/java/net/minecraft/server/EntityFireball.java
+++ b/src/main/java/net/minecraft/server/EntityFireball.java
@@ -69,11 +69,11 @@ public class EntityFireball extends Entity {
this.dirZ = d2 / d3 * 0.1D;
}
- public void G_() {
+ public void F_() {
if (!this.world.isStatic && (this.shooter != null && this.shooter.dead || !this.world.isLoaded((int) this.locX, (int) this.locY, (int) this.locZ))) {
this.die();
} else {
- super.G_();
+ super.F_();
this.setOnFire(1);
if (this.i) {
int i = this.world.getTypeId(this.e, this.f, this.g);
@@ -171,7 +171,7 @@ public class EntityFireball extends Entity {
this.yaw = this.lastYaw + (this.yaw - this.lastYaw) * 0.2F;
float f2 = 0.95F;
- if (this.aT()) {
+ if (this.aU()) {
for (int k = 0; k < 4; ++k) {
float f3 = 0.25F;
@@ -235,9 +235,9 @@ public class EntityFireball extends Entity {
}
public boolean damageEntity(DamageSource damagesource, int i) {
- this.aV();
+ this.aW();
if (damagesource.getEntity() != null) {
- Vec3D vec3d = damagesource.getEntity().aI();
+ Vec3D vec3d = damagesource.getEntity().aJ();
if (vec3d != null) {
this.motX = vec3d.a;