diff --git a/torchlight_changes_unloze/torchlight3/Torchlight/AudioManager.py b/torchlight_changes_unloze/torchlight3/Torchlight/AudioManager.py index 3721044..f81b310 100755 --- a/torchlight_changes_unloze/torchlight3/Torchlight/AudioManager.py +++ b/torchlight_changes_unloze/torchlight3/Torchlight/AudioManager.py @@ -272,10 +272,6 @@ class AudioManager(): return True def Stop(self, player, extra): - Level = 0 - if player.Access: - Level = player.Access["level"] - StopLevel = self.Torchlight().Config["AntiSpam"]["StopLevel"] ExtraFilter = extra.strip().lower() if isinstance(extra, str) else "" Result = {"matched": 0, "stopped": 0, "pending": 0} @@ -284,28 +280,11 @@ class AudioManager(): continue Result["matched"] += 1 - # Always allow users to stop their own clip immediately. - requires_votes = player != AudioClip.Player and \ - (not Level or (Level < AudioClip.Level and Level < StopLevel)) - - if requires_votes: - AudioClip.Stops.add(player.UserID) - - if len(AudioClip.Stops) >= 3: - AudioClip.Stop() - Result["stopped"] += 1 - self.Torchlight().SayPrivate(AudioClip.Player, "Your audio clip was stopped.") - if player != AudioClip.Player: - self.Torchlight().SayPrivate(player, "Stopped \"{0}\"({1}) audio clip.".format(AudioClip.Player.Name, AudioClip.Player.UserID)) - else: - Result["pending"] += 1 - self.Torchlight().SayPrivate(player, "This audio clip needs {0} more !stop's.".format(3 - len(AudioClip.Stops))) - else: - AudioClip.Stop() - Result["stopped"] += 1 - self.Torchlight().SayPrivate(AudioClip.Player, "Your audio clip was stopped.") - if player != AudioClip.Player: - self.Torchlight().SayPrivate(player, "Stopped \"{0}\"({1}) audio clip.".format(AudioClip.Player.Name, AudioClip.Player.UserID)) + AudioClip.Stop() + Result["stopped"] += 1 + self.Torchlight().SayPrivate(AudioClip.Player, "Your audio clip was stopped.") + if player != AudioClip.Player: + self.Torchlight().SayPrivate(player, "Stopped \"{0}\"({1}) audio clip.".format(AudioClip.Player.Name, AudioClip.Player.UserID)) return Result