From 1d63738a31de24fcf5502ce9dd390761043d722b Mon Sep 17 00:00:00 2001
From: SchokoShampoo <33690592+SchokoShampoo@users.noreply.github.com>
Date: Mon, 10 Dec 2018 10:46:46 +0100
Subject: [PATCH] Fixing issue Alf21/TTT2#157 Alf21/TTT2#142 Alf21/TTT2#151

---
 gamemodes/terrortown/entities/entities/jester/shared.lua | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gamemodes/terrortown/entities/entities/jester/shared.lua b/gamemodes/terrortown/entities/entities/jester/shared.lua
index 1d22103..4ccc4a6 100644
--- a/gamemodes/terrortown/entities/entities/jester/shared.lua
+++ b/gamemodes/terrortown/entities/entities/jester/shared.lua
@@ -247,6 +247,12 @@ if SERVER then
 		end
 	end)
 
+	hook.Add("TTTEndRound", "JesterEndRound", function()
+		for _, v in ipairs(player.GetAll()) do
+			hook.Remove("PostPlayerDeath", "JesterWaitForKillerDeath_" .. v:Nick())
+		end
+	end)
+
 	hook.Add("PlayerCanPickupWeapon", "JesterPickupWeapon", function(ply, wep)
 		if IsValid(ply) and IsValid(wep) and ply:GetSubRole() == ROLE_JESTER then
 			if wep:GetClass() == "weapon_zm_molotov" then