fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version bump to 4.3.14

Browse Source
This commit is contained in:
WinDanesz
2024-05-18 16:04:04 +02:00
parent 936601cbad
commit 65ed0e8a22
6 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/Wizardry.java
+1 -1
View File
@@ -82,7 +82,7 @@ public class Wizardry {
* 1.x.x represents Minecraft 1.7.x versions, 2.x.x represents Minecraft 1.10.x versions, 3.x.x represents Minecraft
* 1.11.x versions, and so on.
*/
public static final String VERSION = "4.3.13";
public static final String VERSION = "4.3.14";
/**
* Json file used by Forge's built-in <a href="https://mcforge.readthedocs.io/en/1.12.x/gettingstarted/autoupdate/">update checker</a>.
src/main/java/electroblob/wizardry/integration/baubles/WizardryBaublesIntegration.java
-1
View File
@@ -49,7 +49,6 @@ public final class WizardryBaublesIntegration {
ARTEFACT_TYPE_MAP.put(ItemArtefact.Type.BELT, BaubleType.BELT);
ARTEFACT_TYPE_MAP.put(ItemArtefact.Type.BODY, BaubleType.BODY);
ARTEFACT_TYPE_MAP.put(ItemArtefact.Type.HEAD, BaubleType.HEAD);
ARTEFACT_TYPE_MAP.put(ItemArtefact.Type.TRINKET, BaubleType.TRINKET);
}
public static boolean enabled(){
src/main/java/electroblob/wizardry/spell/Telekinesis.java
+6 -6
View File
@@ -36,15 +36,15 @@ public class Telekinesis extends SpellRay {
target.motionZ = (origin.z - target.posZ) / 6;
return true;
} else if (target instanceof EntityPlayer && (Wizardry.settings.telekineticDisarmament && !ItemArtefact.isArtefactActive((EntityPlayer) target, WizardryItems.amulet_anchoring)) {
} else if (target instanceof EntityPlayer && (Wizardry.settings.telekineticDisarmament && !ItemArtefact.isArtefactActive((EntityPlayer) target, WizardryItems.amulet_anchoring))) {
EntityPlayer player = (EntityPlayer) target;
EntityPlayer player = (EntityPlayer)target;
// IDEA: Disarm the offhand if the mainhand is empty or otherwise harmless?
if(!player.getHeldItemMainhand().isEmpty()){
if (!player.getHeldItemMainhand().isEmpty()) {
if(!world.isRemote){
if (!world.isRemote) {
EntityItem item = player.entityDropItem(player.getHeldItemMainhand(), 0);
// Makes the item move towards the caster
item.motionX = (origin.x - player.posX) / 20;
@@ -52,7 +52,7 @@ public class Telekinesis extends SpellRay {
}
player.setHeldItem(EnumHand.MAIN_HAND, ItemStack.EMPTY);
return true;
}
}