Bladeren bron

Fix Team vs Team (3x3) not show Aura in Olympiad

Fixes #414
Maneco2 2 jaren geleden
bovenliggende
commit
a7e9c804e7

+ 2 - 0
src/main/java/com/l2jserver/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -26,6 +26,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.enums.Team;
 import com.l2jserver.gameserver.instancemanager.AntiFeedManager;
 import com.l2jserver.gameserver.instancemanager.CastleManager;
 import com.l2jserver.gameserver.instancemanager.FortManager;
@@ -351,6 +352,7 @@ public abstract class AbstractOlympiadGame {
 		if ((loc.getX() == 0) && (loc.getY() == 0)) {
 			return;
 		}
+		player.setTeam(Team.NONE);
 		player.setIsPendingRevive(false);
 		player.setInstanceId(0);
 		player.teleToLocation(loc);

+ 3 - 0
src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameTeams.java

@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.logging.Level;
 
 import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.enums.Team;
 import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.Location;
@@ -276,10 +277,12 @@ public class OlympiadGameTeams extends AbstractOlympiadGame {
 	protected final void removals() {
 		for (int i = _teamOneSize; --i >= 0;) {
 			removals(_teamOne[i].getPlayer(), false);
+			_teamOne[i].getPlayer().setTeam(Team.BLUE);
 		}
 		
 		for (int i = _teamTwoSize; --i >= 0;) {
 			removals(_teamTwo[i].getPlayer(), false);
+			_teamTwo[i].getPlayer().setTeam(Team.RED);
 		}
 	}