Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- ### Eclipse Workspace Patch 1.0
- #P trunk3
- Index: gameserver/head-src/com/l2jfrozen/gameserver/model/L2Character.java
- ===================================================================
- --- gameserver/head-src/com/l2jfrozen/gameserver/model/L2Character.java (revision 909)
- +++ gameserver/head-src/com/l2jfrozen/gameserver/model/L2Character.java (working copy)
- @@ -219,6 +219,8 @@
- private boolean _blocked;
- private boolean _meditated;
- + private int _team = 0;
- +
- /**
- * Zone system<br>
- * x^2 or x*x
- @@ -2984,14 +2986,20 @@
- {
- // _log.fine("Stopping PvP");
- stopPvPFlag();
- + setTeam(0);
- +
- }
- else if(System.currentTimeMillis() > getPvpFlagLasts() - 5000)
- {
- updatePvPFlag(2);
- + setTeam(1);
- +
- }
- else
- {
- updatePvPFlag(1);
- + setTeam(1);
- +
- // Start a new PvP timer check
- //checkPvPFlag();
- }
- @@ -8903,10 +8911,28 @@
- public void startPvPFlag()
- {
- updatePvPFlag(1);
- -
- + setTeam(1);
- +
- +
- _PvPRegTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new PvPFlag(), 1000, 1000);
- + setTeam(0);
- +
- + }
- +
- + /**
- + * @param i
- + */
- + public void setTeam(int team)
- + {
- + _team = team;
- }
- + public int getTeam()
- + {
- + return _team;
- + }
- +
- +
- public void stopPvpRegTask()
- {
- if(_PvPRegTask != null)
- @@ -8920,7 +8946,8 @@
- stopPvpRegTask();
- updatePvPFlag(0);
- -
- + setTeam(0);
- +
- _PvPRegTask = null;
- }
- Index: gameserver/head-src/com/l2jfrozen/gameserver/model/actor/instance/L2PcInstance.java
- ===================================================================
- --- gameserver/head-src/com/l2jfrozen/gameserver/model/actor/instance/L2PcInstance.java (revision 909)
- +++ gameserver/head-src/com/l2jfrozen/gameserver/model/actor/instance/L2PcInstance.java (working copy)
- @@ -6346,7 +6346,9 @@
- }
- setPvpFlag(0); // Clear the pvp flag
- -
- + setTeam(0);
- + broadcastUserInfo();
- +
- // Unsummon Cubics
- if(_cubics.size() > 0)
- {
- @@ -7188,6 +7190,7 @@
- updateTitle();
- }
- + setTeam(2);
- //Update the character's title color if they reached any of the 5 PK levels.
- updatePkColor(getPkKills());
- broadcastUserInfo();
- @@ -7243,6 +7246,8 @@
- if(getPvpFlag() == 0)
- {
- startPvPFlag();
- + setTeam(1);
- + broadcastUserInfo();
- }
- }
- @@ -7281,6 +7286,8 @@
- if(getPvpFlag() == 0)
- {
- startPvPFlag();
- + setTeam(1);
- + broadcastUserInfo();
- }
- }
- player_target = null;
Advertisement
Add Comment
Please, Sign In to add comment
