Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions src/main/java/openblocks/common/entity/EntityHangGlider.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,19 +76,19 @@ private static boolean isGliderValid(EntityPlayer player, EntityHangGlider glide

@SideOnly(Side.CLIENT)
public static void updateGliders(World worldObj) {
Iterator<Map.Entry<EntityPlayer, EntityHangGlider>> iterator = gliderMap.entrySet().iterator();
while (iterator.hasNext()) {
Map.Entry<EntityPlayer, EntityHangGlider> e = iterator.next();
EntityPlayer player = e.getKey();
EntityHangGlider glider = e.getValue();

if (isGliderValid(player, glider)) {
glider.fixPositions(player, true);
} else {
iterator.remove();
glider.setDeadUnsafe();
}
}
Iterator<Map.Entry<EntityPlayer, EntityHangGlider>> iterator = gliderMap.entrySet().iterator();
while (iterator.hasNext()) {
Map.Entry<EntityPlayer, EntityHangGlider> e = iterator.next();
EntityPlayer player = e.getKey();
EntityHangGlider glider = e.getValue();

if (isGliderValid(player, glider)) {
glider.fixPositions(player, true);
} else {
iterator.remove();
glider.setDeadUnsafe();
}
}
}

private EntityPlayer player;
Expand Down Expand Up @@ -257,16 +257,16 @@ public void setDead() {
setDeadUnsafe();
}

private void setDeadUnsafe() {
super.setDead();
private void setDeadUnsafe() {
super.setDead();

if (varioControl.isValid()) {
varioControl.kill();
varioControl.release();
ticksSinceLastVarioUpdate = 0;
verticalMotionSinceLastVarioUpdate = 0;
}
}
if (varioControl.isValid()) {
varioControl.kill();
varioControl.release();
ticksSinceLastVarioUpdate = 0;
verticalMotionSinceLastVarioUpdate = 0;
}
}

private void fixPositions(EntityPlayer thePlayer, boolean localPlayer) {
this.lastTickPosX = prevPosX = player.prevPosX;
Expand Down