Merge branch '1.4' into 1.4_mergedtesting

Chik3r · Mar 11, 2021 · fadb994 · fadb994
2 parents 19829f3 + 109d6b5
commit fadb994
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/patches/tModLoader/Terraria/Player.cs.patch b/patches/tModLoader/Terraria/Player.cs.patch
@@ -3379,13 +3379,16 @@
  		}
 
  		public float GetAdjustedItemScale(Item item) {
-@@ -29702,6 +_,9 @@
+@@ -29702,6 +_,12 @@
  		}
 
  		public void ItemCheck(int i) {
-+			if (!PlayerHooks.PreItemCheck(this))
-+				return;
++			if (PlayerHooks.PreItemCheck(this))
++				ItemCheck_Inner(i);
 +
++			PlayerHooks.PostItemCheck(this);
++		}
++		private void ItemCheck_Inner(int i) {
  			if (CCed) {
  				channel = false;
  				itemAnimation = (itemAnimationMax = 0);
@@ -3590,7 +3593,7 @@
  							if (item.stack > 0)
  								item.stack--;
 
-@@ -30284,8 +_,13 @@
+@@ -30284,6 +_,9 @@
  				}
  			}
 
@@ -3599,11 +3602,7 @@
 +
  			if (itemAnimation == 0)
  				JustDroppedAnItem = false;
-+
-+			PlayerHooks.PostItemCheck(this);
  		}
-
- 		private void ItemCheck_EmitFoodParticles(Item sItem) {
 @@ -30538,11 +_,18 @@
  				if (i == whoAmI || !player.active || !player.hostile || player.immune || player.dead || (team != 0 && team == player.team) || !itemRectangle.Intersects(player.Hitbox) || !CanHit(player))
  					continue;