Skip to content

Modify BreakSpeed event handling for compatibility #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MachineMuse wants to merge 1 commit into
base: 1.7.10
Choose a base branch
from
Open

Modify BreakSpeed event handling for compatibility #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions src/main/java/bspkrs/treecapitator/forge/ForgeEventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,17 @@ public void getPlayerBreakSpeed(BreakSpeed event)
int height = Treecapitator.getTreeHeight(treeDef, event.entityPlayer.worldObj, event.x, event.y, event.z, event.metadata, event.entityPlayer);
if (height > 1)
{
event.newSpeed = event.originalSpeed / (height * TCSettings.treeHeightModifier);
TCLog.debug("Old Break Speed: %s", event.originalSpeed);
float oldSpeed = event.newSpeed;
event.newSpeed = oldSpeed / (height * TCSettings.treeHeightModifier);
TCLog.debug("Old Break Speed: %s", oldSpeed);
TCLog.debug("New Break Speed: %s", event.newSpeed);
TCLog.debug("Tree Height : %d", height);
TCLog.debug("Tree Height Mod: %s", TCSettings.treeHeightModifier);
}
}
}
else if (Treecapitator.isBreakingEnabled(event.entityPlayer))
event.newSpeed = event.originalSpeed * treeDef.breakSpeedModifier();
event.newSpeed = event.newSpeed * treeDef.breakSpeedModifier();
}
else
event.newSpeed = 0.0f;
Expand Down Expand Up @@ -161,7 +162,7 @@ private class CachedBreakSpeed extends BreakSpeed

public CachedBreakSpeed(BreakSpeed event, boolean swappedSneak)
{
super(event.entityPlayer, event.block, event.metadata, event.originalSpeed, event.x, event.y, event.z);
super(event.entityPlayer, event.block, event.metadata, event.newSpeed, event.x, event.y, event.z);
this.isSneaking = event.entityPlayer.isSneaking();
this.swappedSneak = swappedSneak;
}
Expand All @@ -186,7 +187,7 @@ public boolean equals(Object o)
: thisItem == null || thisItem.getItem() == null)
&& GameData.getBlockRegistry().getNameForObject(bs.block).equals(GameData.getBlockRegistry().getNameForObject(this.block))
&& bs.isSneaking == this.isSneaking && bs.swappedSneak == this.swappedSneak
&& bs.metadata == this.metadata && bs.originalSpeed == this.originalSpeed && bs.x == this.x && bs.y == this.y && bs.z == this.z;
&& bs.metadata == this.metadata && bs.newSpeed == this.newSpeed && bs.x == this.x && bs.y == this.y && bs.z == this.z;
}

@Override
Expand All @@ -200,7 +201,7 @@ public int hashCode()
.putBoolean(this.isSneaking)
.putBoolean(this.swappedSneak)
.putInt(this.metadata)
.putFloat(this.originalSpeed)
.putFloat(this.newSpeed)
.putInt(x + z << 8 + y << 16);

if (thisItem != null && thisItem.getItem() != null)
Expand Down