Browse Source

fix for buff removal on tvt teleport

janiii 15 years ago
parent
commit
a09f0c4241

+ 4 - 4
L2_GameServer/java/com/l2jserver/gameserver/model/entity/TvTEventTeleporter.java

@@ -68,13 +68,13 @@ public class TvTEventTeleporter implements Runnable
 		if (summon != null)
 			summon.unSummon(_playerInstance);
 
-		if (_playerInstance.isInDuel())
-			_playerInstance.setDuelState(Duel.DUELSTATE_INTERRUPTED);
-
 		if (Config.TVT_EVENT_EFFECTS_REMOVAL == 0
-				|| (Config.TVT_EVENT_EFFECTS_REMOVAL == 1 && _playerInstance.getTeam() == 0))
+				|| (Config.TVT_EVENT_EFFECTS_REMOVAL == 1 && (_playerInstance.getTeam() == 0 || (_playerInstance.isInDuel() && _playerInstance.getDuelState() != Duel.DUELSTATE_INTERRUPTED))))
 			_playerInstance.stopAllEffectsExceptThoseThatLastThroughDeath();
 
+		if (_playerInstance.isInDuel())
+			_playerInstance.setDuelState(Duel.DUELSTATE_INTERRUPTED);
+
 		int TvTInstance = TvTEvent.getTvTEventInstance();
 		if (TvTInstance != 0)
 		{