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

Update to Minecraft 1.3 beta

Browse Source
This commit is contained in:
Dinnerbone
2011-02-23 02:37:56 +00:00
parent a124bfdab5
commit f759e0b60d
83 changed files with 3182 additions and 3292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,27 +20,27 @@ public class EntityMonster extends EntityCreature implements IMonster {
this.health = 20;
}
public void o() {
float f = this.b(1.0F);
public void q() {
float f = this.c(1.0F);
if (f > 0.5F) {
this.bw += 2;
this.at += 2;
}
super.o();
super.q();
}
public void b_() {
super.b_();
if (this.world.k == 0) {
this.q();
public void f_() {
super.f_();
if (this.world.j == 0) {
this.C();
}
}
protected Entity l() {
EntityHuman entityhuman = this.world.a(this, 16.0D);
return entityhuman != null && this.i(entityhuman) ? entityhuman : null;
return entityhuman != null && this.e(entityhuman) ? entityhuman : null;
}
public boolean a(Entity entity, int i) {
@@ -57,9 +57,9 @@ public class EntityMonster extends EntityCreature implements IMonster {
server.getPluginManager().callEvent(event);
if (!event.isCancelled()) {
if (event.getTarget() == null) {
d = null;
this.d = null;
} else {
d = ((CraftEntity) event.getTarget()).getHandle();
this.d = ((CraftEntity) event.getTarget()).getHandle();
}
}
// CraftBukkit end
@@ -75,10 +75,10 @@ public class EntityMonster extends EntityCreature implements IMonster {
}
protected void a(Entity entity, float f) {
if ((double) f < 2.5D && entity.boundingBox.e > this.boundingBox.b && entity.boundingBox.b < this.boundingBox.e) {
if ((double) f < 1.5D && entity.boundingBox.e > this.boundingBox.b && entity.boundingBox.b < this.boundingBox.e) {
this.attackTicks = 20;
// CraftBukkit start
if(entity instanceof EntityLiving) {
if (entity instanceof EntityLiving) {
CraftServer server = ((WorldServer) this.world).getServer();
org.bukkit.entity.Entity damager = this.getBukkitEntity();
org.bukkit.entity.Entity damagee = (entity == null) ? null : entity.getBukkitEntity();