Merge remote-tracking branch 'upstream/amir/NPCs' into npc-features

Author: NoPressF

.github/workflows/build.yml

@@ -33,7 +33,7 @@ on:
 jobs:
   build-windows:
     name: Windows build
-    runs-on: windows-2019
+    runs-on: windows-latest
 
     strategy:
       matrix:

Server/Components/NPCs/npcs_impl.cpp

@@ -121,11 +121,11 @@ void NPCComponent::onPlayerGiveDamage(IPlayer& player, IPlayer& to, float amount
 		auto npc = static_cast<NPC*>(get(to.getID()));
 		if (npc && npc->getPlayer()->getID() == to.getID())
 		{
-			shouldCallCustomEvents = true;
+			shouldCallCustomEvents = false;
 			bool eventResult = emulatePlayerGiveDamageToNPCEvent(player, *npc, amount, weapon, part, false);
 			npc->processDamage(&player, amount, weapon, part, eventResult);
+			shouldCallCustomEvents = true;
 		}
-		shouldCallCustomEvents = false;
 	}
 }