summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityComplex.java
diff options
context:
space:
mode:
authorSam Wilson <sam.wilson@gmail.com>2012-01-23 22:04:18 -0800
committerEvilSeph <evilseph@gmail.com>2012-01-24 04:10:47 -0500
commite92bdab57a1bc5a02801fbf1568e746a66678c3a (patch)
tree45633ff39c9699ff83f2a59abcb9f7911228f151 /src/main/java/net/minecraft/server/EntityComplex.java
parent872dad554044aae57b786d5c14523cee5778ebc7 (diff)
downloadcraftbukkit-e92bdab57a1bc5a02801fbf1568e746a66678c3a.tar
craftbukkit-e92bdab57a1bc5a02801fbf1568e746a66678c3a.tar.gz
craftbukkit-e92bdab57a1bc5a02801fbf1568e746a66678c3a.tar.lz
craftbukkit-e92bdab57a1bc5a02801fbf1568e746a66678c3a.tar.xz
craftbukkit-e92bdab57a1bc5a02801fbf1568e746a66678c3a.zip
Fixed CraftLivingEntity.damage when the entity is an EntityComplex.
Fixes BUKKIT-589: if you call damage on an instance of EnderDragon, no damage is done. Reason for bug: damage calls Entity.damageEntity. But EntityComplex overrides damageEntity to do nothing. Fix: CraftComplexLiving should call EntityComplex.e instead of Entity.damageEntity. e is the method that actually does damage to an instance of EntityComplex.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityComplex.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityComplex.java26
1 files changed, 26 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/EntityComplex.java b/src/main/java/net/minecraft/server/EntityComplex.java
new file mode 100644
index 00000000..29c337c0
--- /dev/null
+++ b/src/main/java/net/minecraft/server/EntityComplex.java
@@ -0,0 +1,26 @@
+package net.minecraft.server;
+
+public class EntityComplex extends EntityLiving {
+
+ protected int t = 100;
+
+ public EntityComplex(World world) {
+ super(world);
+ }
+
+ public int getMaxHealth() {
+ return this.t;
+ }
+
+ public boolean a(EntityComplexPart entitycomplexpart, DamageSource damagesource, int i) {
+ return this.damageEntity(damagesource, i);
+ }
+
+ public boolean damageEntity(DamageSource damagesource, int i) {
+ return false;
+ }
+
+ public boolean e(DamageSource damagesource, int i) { // CraftBukkit - protected -> public
+ return super.damageEntity(damagesource, i);
+ }
+}