diff --git a/src/k_collide.cpp b/src/k_collide.cpp
index 6fac60d23..4e1a3451b 100644
--- a/src/k_collide.cpp
+++ b/src/k_collide.cpp
@@ -1224,7 +1224,7 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2)
 	// Ring sting, this is a bit more unique
 	auto doSting = [](mobj_t *t1, mobj_t *t2)
 	{
-		if (K_GetShieldFromItem(t2->player->itemtype) != KSHIELD_NONE)
+		if (t2->player->curshield != KSHIELD_NONE)
 		{
 			return false;
 		}
diff --git a/src/k_kart.c b/src/k_kart.c
index a9dc33bab..7ccf885d5 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -697,7 +697,7 @@ static fixed_t K_PlayerWeight(mobj_t *mobj, mobj_t *against)
 	}
 	else if (against && !P_MobjWasRemoved(against) && against->player
 		&& ((!P_PlayerInPain(against->player) && P_PlayerInPain(mobj->player)) // You're hurt
-		|| (against->player->itemtype == KITEM_BUBBLESHIELD && mobj->player->itemtype != KITEM_BUBBLESHIELD))) // They have a Bubble Shield
+		|| (against->player->curshield == KSHIELD_BUBBLE && mobj->player->curshield != KSHIELD_BUBBLE))) // They have a Bubble Shield
 	{
 		weight = 0; // This player does not cause any bump action
 	}
@@ -721,7 +721,7 @@ static fixed_t K_PlayerWeight(mobj_t *mobj, mobj_t *against)
 		}
 		else
 		{
-			if (mobj->player->itemtype == KITEM_BUBBLESHIELD)
+			if (mobj->player->curshield == KSHIELD_BUBBLE)
 				weight += 9*FRACUNIT;
 		}
 
@@ -814,8 +814,8 @@ static void K_SpawnBumpForObjs(mobj_t *mobj1, mobj_t *mobj2)
 
 	P_SetScale(fx, (fx->destscale = avgScale));
 
-	if ((mobj1->player && mobj1->player->itemtype == KITEM_BUBBLESHIELD)
-	|| (mobj2->player && mobj2->player->itemtype == KITEM_BUBBLESHIELD))
+	if ((mobj1->player && mobj1->player->curshield == KSHIELD_BUBBLE)
+	|| (mobj2->player && mobj2->player->curshield == KSHIELD_BUBBLE))
 	{
 		S_StartSound(mobj1, sfx_s3k44);
 	}
@@ -7461,7 +7461,7 @@ void K_UpdateHnextList(player_t *player, boolean clean)
 // For getting hit!
 void K_PopPlayerShield(player_t *player)
 {
-	INT32 shield = K_GetShieldFromItem(player->itemtype);
+	INT32 shield = player->curshield;
 
 	// Doesn't apply if player is invalid.
 	if (player->mo == NULL || P_MobjWasRemoved(player->mo))
@@ -10566,7 +10566,7 @@ void K_KartPlayerAfterThink(player_t *player)
 		player->jawztargetdelay = 0;
 	}
 
-	if (player->itemtype == KITEM_LIGHTNINGSHIELD || ((gametyperules & GTR_POWERSTONES) && K_IsPlayerWanted(player)))
+	if (player->curshield == KSHIELD_LIGHTNING || ((gametyperules & GTR_POWERSTONES) && K_IsPlayerWanted(player)))
 	{
 		K_LookForRings(player->mo);
 	}
diff --git a/src/k_roulette.c b/src/k_roulette.c
index ebc1806b5..bba953a64 100644
--- a/src/k_roulette.c
+++ b/src/k_roulette.c
@@ -1078,7 +1078,7 @@ static boolean K_IsItemUselessAlone(kartitems_t item)
 		case KRITEM_TRIPLEORBINAUT:
 		case KRITEM_QUADORBINAUT:
 		case KITEM_BALLHOG:
-		case KITEM_BUBBLESHIELD:
+		case KITEM_BUBBLESHIELD: // shhhhhh
 			return true;
 		default:
 			return false;
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 21f1a1c93..de957c0c4 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -3640,7 +3640,7 @@ void A_AttractChase(mobj_t *actor)
 			if (
 				actor->tracer->player && actor->tracer->health
 				&& ((gametyperules & GTR_SPHERES)
-					|| (actor->tracer->player->itemtype == KITEM_LIGHTNINGSHIELD
+					|| (actor->tracer->player->curshield == KSHIELD_LIGHTNING
 					&& RINGTOTAL(actor->tracer->player) < 20
 					&& !(actor->tracer->player->pflags & PF_RINGLOCK)))
 				//&& P_CheckSight(actor, actor->tracer)