Update for minor remapping changes.

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2015-07-30 16:56:52 +10:00
parent 332e77d249
commit c35a7254c5
24 changed files with 135 additions and 189 deletions

View File

@@ -12,11 +12,11 @@
}
protected int f(World world, BlockPosition blockposition) {
- int i = Math.min(world.a(Entity.class, this.a(blockposition)).size(), this.b);
- int i = Math.min(world.a(Entity.class, this.getBoundingBox(blockposition)).size(), this.weight);
+ // CraftBukkit start
+ //int i = Math.min(world.a(Entity.class, this.a(blockposition)).size(), this.b);
+ int i = 0;
+ java.util.Iterator iterator = world.a(Entity.class, this.a(blockposition)).iterator();
+ java.util.Iterator iterator = world.a(Entity.class, this.getBoundingBox(blockposition)).iterator();
+
+ while (iterator.hasNext()) {
+ Entity entity = (Entity) iterator.next();
@@ -36,8 +36,8 @@
+ }
+ }
+
+ i = Math.min(i, this.b);
+ i = Math.min(i, this.weight);
+ // CraftBukkit end
if (i > 0) {
float f = (float) Math.min(this.b, i) / (float) this.b;
float f = (float) Math.min(this.weight, i) / (float) this.weight;