Update 1.3.3

Fox2Code · Sep 24, 2024 · bcb4715 · bcb4715
1 parent ef58554
commit bcb4715
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/client/src/main/java/com/fox2code/foxloader/client/mixins/MixinEntityPlayer.java b/client/src/main/java/com/fox2code/foxloader/client/mixins/MixinEntityPlayer.java
@@ -32,7 +32,7 @@ public void onAttackTargetEntityWithCurrentItem(Entity var1, CallbackInfo ci) {
         if (!(this instanceof NetworkPlayer)) return;
         NetworkPlayer networkPlayer = (NetworkPlayer) this;
         if (ModLoader.Internal.notifyPlayerAttackEntity(networkPlayer,
-                networkPlayer.getRegisteredHeldItem(), (RegisteredEntity) var1)) {
+                networkPlayer.getRegisteredHeldItem(), (RegisteredEntity) var1, false)) {
             ci.cancel();
         }
     }

diff --git a/common/src/main/java/com/fox2code/foxloader/loader/ModLoader.java b/common/src/main/java/com/fox2code/foxloader/loader/ModLoader.java
@@ -602,8 +602,8 @@ public static boolean notifyPlayerUseItemOnEntity(
         }
 
         public static boolean notifyPlayerAttackEntity(
-                NetworkPlayer networkPlayer, RegisteredItemStack itemStack, RegisteredEntity targetEntity) {
-            boolean cancelled = false;
+                NetworkPlayer networkPlayer, RegisteredItemStack itemStack, RegisteredEntity targetEntity,
+                boolean cancelled) {
             for (ModContainer modContainer : modContainers.values()) {
                 cancelled = modContainer.notifyPlayerAttackEntity(
                         networkPlayer, itemStack, targetEntity, cancelled);

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx1024m -XX:-UseGCOverheadLimit -Dfile.encoding=UTF-8
 
 # FoxLoader properties
-foxloader.version=1.3.2
+foxloader.version=1.3.3
 foxloader.lastReIndevTransformerChanges=1.3.0
 # https://www.jitpack.io/#com.fox2code/FoxLoader
 

diff --git a/server/src/main/java/com/fox2code/foxloader/server/mixins/MixinEntityPlayer.java b/server/src/main/java/com/fox2code/foxloader/server/mixins/MixinEntityPlayer.java
@@ -4,6 +4,7 @@
 import com.fox2code.foxloader.loader.lua.LuaObjectHolder;
 import com.fox2code.foxloader.network.NetworkPlayer;
 import com.fox2code.foxloader.registry.RegisteredEntity;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.src.game.entity.Entity;
 import net.minecraft.src.game.entity.player.EntityPlayer;
 import net.minecraft.src.game.nbt.NBTTagCompound;
@@ -33,8 +34,11 @@ public void onUseCurrentItemOnEntity(Entity var1, CallbackInfo ci) {
     public void onAttackTargetEntityWithCurrentItem(Entity var1, CallbackInfo ci) {
         if (!(this instanceof NetworkPlayer)) return;
         NetworkPlayer networkPlayer = (NetworkPlayer) this;
+        // Hotfix: Can attack with some items when pvp is off.
+        boolean cancelled = var1 instanceof NetworkPlayer &&
+                !MinecraftServer.getInstance().pvpOn;
         if (ModLoader.Internal.notifyPlayerAttackEntity(networkPlayer,
-                networkPlayer.getRegisteredHeldItem(), (RegisteredEntity) var1)) {
+                networkPlayer.getRegisteredHeldItem(), (RegisteredEntity) var1, cancelled)) {
             ci.cancel();
         }
     }