Merge remote-tracking branch 'origin/dev'

# Conflicts: # EXILED.props
Exiled-Team · Mar 23, 2023 · 12c80de · 12c80de
2 parents f469b00 + 049e7e8
commit 12c80de
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/EXILED.props b/EXILED.props
@@ -15,7 +15,7 @@
 
   <PropertyGroup>
     <!-- This is the global version and is used for all projects that don't have a version -->
-    <Version Condition="$(Version) == ''">6.0.4</Version>
+    <Version Condition="$(Version) == ''">6.0.5</Version>
     <!-- Enables public beta warning via the PUBLIC_BETA constant -->
     <PublicBeta>false</PublicBeta>
 

diff --git a/Exiled.API/Features/DamageHandlers/DamageHandler.cs b/Exiled.API/Features/DamageHandlers/DamageHandler.cs
@@ -52,7 +52,7 @@ public DamageHandler(Player target, BaseHandler baseHandler)
             Target = target;
             Attacker = baseHandler is PlayerStatsSystem.AttackerDamageHandler handler ? Player.Get(handler.Attacker.Hub) : null;
             TargetFootprint = target == null ? default : target.Footprint;
-            AttackerFootprint = baseHandler is PlayerStatsSystem.AttackerDamageHandler handle ? handle.Attacker : Attacker?.Footprint ?? default;
+            AttackerFootprint = baseHandler is PlayerStatsSystem.AttackerDamageHandler handle ? handle.Attacker : Attacker?.Footprint ?? TargetFootprint;
         }
 
         /// <summary>

diff --git a/Exiled.CustomItems/API/Features/CustomWeapon.cs b/Exiled.CustomItems/API/Features/CustomWeapon.cs
@@ -190,7 +190,7 @@ protected virtual void OnShot(ShotEventArgs ev)
         /// <param name="ev"><see cref="HurtingEventArgs"/>.</param>
         protected virtual void OnHurting(HurtingEventArgs ev)
         {
-            if (ev.IsAllowed)
+            if (ev.IsAllowed && Damage > 0f)
                 ev.Amount = Damage;
         }
 

diff --git a/Exiled.Events/Patches/Fixes/GrenadePropertiesFix.cs b/Exiled.Events/Patches/Fixes/GrenadePropertiesFix.cs
@@ -36,7 +36,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             LocalBuilder throwable = generator.DeclareLocal(typeof(ThrowableItem));
             LocalBuilder projectile = generator.DeclareLocal(typeof(Projectile));
             LocalBuilder playerCamera = generator.DeclareLocal(typeof(Transform));
-            LocalBuilder scale = generator.DeclareLocal(typeof(Vector3));
 
             Label cnt = generator.DefineLabel();
 
@@ -56,7 +55,7 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
             // baseProjectile.transform.rotation = this.Owner.PlayerCameraReference.rotation;
             // baseProjectile.gameObject.SetActive(true);
             // projectile.Spawned = true;
-            newInstructions.InsertRange(index, new CodeInstruction[]
+            newInstructions.InsertRange(index, new[]
             {
                 // if (Item.Get(this) is Throwable throwable) goto cnt;
                 new CodeInstruction(OpCodes.Ldarg_0),
@@ -74,9 +73,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
 
                 // Projectile projectile = throwable.Projectile;
                 new CodeInstruction(OpCodes.Ldloc_S, throwable.LocalIndex).WithLabels(cnt),
-                new(OpCodes.Callvirt, PropertyGetter(typeof(Throwable), nameof(Throwable.Scale))),
-                new(OpCodes.Stloc, scale.LocalIndex),
-                new(OpCodes.Ldloc_S, throwable.LocalIndex),
                 new(OpCodes.Callvirt, PropertyGetter(typeof(Throwable), nameof(Throwable.Projectile))),
                 new(OpCodes.Dup),
 
@@ -112,10 +108,6 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi
                 new(OpCodes.Ldloc_S, projectile.LocalIndex),
                 new(OpCodes.Ldc_I4_1),
                 new(OpCodes.Callvirt, PropertySetter(typeof(Projectile), nameof(Projectile.IsSpawned))),
-                new(OpCodes.Ldloc_S, projectile.LocalIndex),
-                new(OpCodes.Callvirt, PropertyGetter(typeof(ThrownProjectile), nameof(ThrownProjectile.transform))),
-                new(OpCodes.Ldloc, scale.LocalIndex),
-                new(OpCodes.Callvirt, PropertySetter(typeof(Transform), nameof(Transform.localScale))),
             });
 
             for (int z = 0; z < newInstructions.Count; z++)