twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-16 20:53:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rename revision 2

Browse Source
This commit is contained in:
Dinnerbone
2011-09-15 17:36:27 +01:00
parent 3c5632de31
commit 2b5a61f03d
29 changed files with 126 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/minecraft/server/EntityMonster.java
View File

@@ -42,7 +42,7 @@ public abstract class EntityMonster extends EntityCreature implements IMonster {
public boolean damageEntity(DamageSource damagesource, int i) {
if (super.damageEntity(damagesource, i)) {
Entity entity = damagesource.a();
Entity entity = damagesource.getEntity();
if (this.passenger != entity && this.vehicle != entity) {
if (entity != this) {
@@ -82,14 +82,14 @@ public abstract class EntityMonster extends EntityCreature implements IMonster {
this.world.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) {
return entity.damageEntity(DamageSource.a(this), event.getDamage());
return entity.damageEntity(DamageSource.mobAttack(this), event.getDamage());
}
return false;
}
// CraftBukkit end
return entity.damageEntity(DamageSource.a((EntityLiving) this), this.damage);
return entity.damageEntity(DamageSource.mobAttack((EntityLiving) this), this.damage);
}
protected void a(Entity entity, float f) {