From 818e3e44b18d10a8d45a151af403ec942033156a Mon Sep 17 00:00:00 2001
From: Jbleezy <thejbirdjustin@yahoo.com>
Date: Sat, 2 Dec 2023 03:31:10 -0800
Subject: [PATCH] Meat powerup: remove spiking the meat

---
 README.md                      |  1 -
 scripts/zm/replaced/zgrief.gsc | 22 ++--------------------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index c2bc925f..9a8f897a 100644
--- a/README.md
+++ b/README.md
@@ -427,7 +427,6 @@
 * No longer able to drop when another meat powerup is already dropped
 * Message shows when the meat is grabbed and landed on a player
 * Meleeing while the meat is moving no longer grabs the meat
-* Meleeing while the meat is moving throws the meat
 * Removed pick up trigger
 
 ## Persistent Upgrades
diff --git a/scripts/zm/replaced/zgrief.gsc b/scripts/zm/replaced/zgrief.gsc
index 58a31077..fa845ae5 100644
--- a/scripts/zm/replaced/zgrief.gsc
+++ b/scripts/zm/replaced/zgrief.gsc
@@ -22,16 +22,7 @@ meat_bounce_override( pos, normal, ent, bounce )
 {
     if ( isdefined( ent ) && isplayer( ent ) && is_player_valid(ent) && !ent hasWeapon("item_meat_zm") && !is_true(ent.dont_touch_the_meat) )
     {
-		if (ent isMeleeing() && level.scr_zm_ui_gametype_obj != "zmeat")
-		{
-			ent thread maps\mp\gametypes_zm\zmeat::spike_the_meat(self);
-
-			return;
-		}
-		else
-		{
-			level thread meat_stink_player( ent );
-		}
+		level thread meat_stink_player( ent );
 
 		if ( isdefined( self.owner ) )
 		{
@@ -71,16 +62,7 @@ meat_bounce_override( pos, normal, ent, bounce )
 
         if ( isdefined( closest_player ) )
         {
-			if (closest_player isMeleeing() && level.scr_zm_ui_gametype_obj != "zmeat")
-			{
-				closest_player thread maps\mp\gametypes_zm\zmeat::spike_the_meat(self);
-
-				return;
-			}
-			else
-			{
-				level thread meat_stink_player( closest_player );
-			}
+			level thread meat_stink_player( closest_player );
 
             if ( isdefined( self.owner ) )
             {