upstream/ThaumicTinkerer
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/ThaumicTinkerer.git synced 2026-11-08 12:44:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10 from GTNewHorizons/patch-dispersed-strike

Browse Source 
Fix GTNewHorizons/GT-New-Horizons-Modpack#6784
This commit is contained in:
Martin Robertz authored and GitHub committed 2020-10-09 15:39:13 +02:00
2 parents 52f872b6ad c8fdb5747f
commit 65ba1f4464
1 file changed
+12 -12
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/thaumic/tinkerer/common/enchantment/ModEnchantmentHandler.java
+12 -12
View File
@@ -36,10 +36,12 @@ import thaumic.tinkerer.common.lib.LibEnchantIDs;
import java.util.List;
import java.util.Random;
import java.util.UUID;
public class ModEnchantmentHandler {
public final String NBTLastTarget = "TTEnchantLastTarget";
public final String NBTLastTarget2 = "TTEnchantLastTarget2";
public final String NBTSuccessiveStrike = "TTEnchantSuccessiveStrike";
@@ -92,29 +94,27 @@ public class ModEnchantmentHandler {
if (heldItem.stackTagCompound == null) {
heldItem.stackTagCompound = new NBTTagCompound();
}
int lastTarget = heldItem.stackTagCompound.getInteger(NBTLastTarget);
UUID lastTarget = new UUID(heldItem.stackTagCompound.getLong(NBTLastTarget), heldItem.stackTagCompound.getLong(NBTLastTarget2));
int successiveStrikes = heldItem.stackTagCompound.getInteger(NBTSuccessiveStrike);
int entityId = event.entityLiving.getEntityId();
UUID entityId = event.entityLiving.getUniqueID();
if (lastTarget != entityId) {
heldItem.stackTagCompound.setInteger(NBTSuccessiveStrike, 0);
if (!lastTarget.equals(entityId)) {
successiveStrikes = 0;
heldItem.stackTagCompound.setLong(NBTLastTarget, entityId.getMostSignificantBits());
heldItem.stackTagCompound.setLong(NBTLastTarget2, entityId.getLeastSignificantBits());
} else {
heldItem.stackTagCompound.setInteger(NBTSuccessiveStrike, successiveStrikes + 1);
successiveStrikes = 1;
successiveStrikes = Math.max(successiveStrikes + 1, 5);
}
heldItem.stackTagCompound.setInteger(NBTSuccessiveStrike, successiveStrikes);
if (focusedStrikes > 0) {
event.ammount /= 2;
event.ammount += (.5 * successiveStrikes * event.ammount * focusedStrikes);
event.ammount += (.5 * Math.max(successiveStrikes, 5) * event.ammount * focusedStrikes);
}
if (dispersedStrikes > 0) {
event.ammount *= 1 + (successiveStrikes / 5);
event.ammount /= (1 + (successiveStrikes * 2));
event.ammount *= 1 + 0.6 * dispersedStrikes + (successiveStrikes / 5);
event.ammount /= 1 + 0.25 * dispersedStrikes + (successiveStrikes * 2.5);
}
heldItem.stackTagCompound.setInteger("TTEnchantLastTarget", entityId);
}
int vampirism = EnchantmentHelper.getEnchantmentLevel(LibEnchantIDs.idVampirism, heldItem);