Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 21:19:00 +01:00
Code Issues Projects Releases Wiki Activity

Fix donkey/mule dupe exploit.

Browse Source
This commit is contained in:
EvilSeph 2013-07-02 23:23:19 -04:00
parent 7b71fc23be
commit 29fa46a4b2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minecraft/server/ContainerHorse.java
View File

@ -60,7 +60,7 @@ public class ContainerHorse extends Container {
} }
public boolean a(EntityHuman entityhuman) { public boolean a(EntityHuman entityhuman) {
return this.a.a(entityhuman) && this.f.d(entityhuman) < 8.0F; return this.a.a(entityhuman) && this.f.isAlive() && this.f.d(entityhuman) < 8.0F; // CraftBukkit - add isAlive as a validator
} }
public ItemStack b(EntityHuman entityhuman, int i) { public ItemStack b(EntityHuman entityhuman, int i) {

2
src/main/java/net/minecraft/server/EntityHorse.java
View File

@ -791,11 +791,13 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener {
return this.passenger == null && this.vehicle == null && this.bS() && this.bR() && !this.cv() && this.getHealth() >= this.getMaxHealth(); return this.passenger == null && this.vehicle == null && this.bS() && this.bR() && !this.cv() && this.getHealth() >= this.getMaxHealth();
} }
/* CraftBukkit start - don't treat horses differently
public void die() { public void die() {
if (this.world.isStatic || !this.bS() && !this.ce() || this.getHealth() <= 0.0F) { if (this.world.isStatic || !this.bS() && !this.ce() || this.getHealth() <= 0.0F) {
super.die(); super.die();
} }
} }
// CraftBukkit end */
public void e(boolean flag) { public void e(boolean flag) {
this.b(32, flag); this.b(32, flag);