TouchAndDie Posted May 27, 2012 Posted May 27, 2012 how can i add this : ### Eclipse Workspace Patch 1.0 #P Chr.6GMS Index: java/net/sf/l2j/gameserver/handler/skillhandlers/Disablers.java =================================================================== --- java/net/sf/l2j/gameserver/handler/skillhandlers/Disablers.java (revision 5263) +++ java/net/sf/l2j/gameserver/handler/skillhandlers/Disablers.java (working copy) @@ -22,9 +22,13 @@ import java.util.logging.Level; import java.util.logging.Logger; +import javolution.util.FastList; + +import net.sf.l2j.gameserver.ThreadPoolManager; import net.sf.l2j.gameserver.ai.CtrlEvent; import net.sf.l2j.gameserver.ai.CtrlIntention; import net.sf.l2j.gameserver.ai.L2AttackableAI; +import net.sf.l2j.gameserver.datatables.SkillTable; import net.sf.l2j.gameserver.handler.ISkillHandler; import net.sf.l2j.gameserver.handler.SkillHandler; import net.sf.l2j.gameserver.model.L2Attackable; @@ -66,6 +70,28 @@ private float _negatePower=0.f; private int _negateId=0; + public class Canc implements Runnable{ + L2PcInstance j; + FastList<L2Effect> l; + + public Canc(L2PcInstance p,FastList<L2Effect> f){ + j = p; + l = f; + } + + public void run(){ + if(l.isEmpty()) + return; + for(L2Effect b : l) + { + L2Skill k = SkillTable.getInstance().getInfo(b.getSkill().getId(), b.getLevel()); + if(k != null) + k.getEffects(j, j); + } + l.clear(); + } + } + @Override public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets) { @@ -454,31 +480,30 @@ if(Rnd.get(100) < landrate) { - L2Effect[] effects = target.getAllEffects(); - int maxfive = 5; - for (L2Effect e : effects) - { - if (e.getSkill().getId() != 4082 && e.getSkill().getId() != 4215 && - e.getSkill().getId() != 4515 && e.getSkill().getId() != 110 && e.getSkill().getId() != 111 && - e.getSkill().getId() != 1323 && e.getSkill().getId() != 1325) // Cannot cancel skills 4082, 4215, 4515, 110, 111, 1323, 1325 - { - if(e.getSkill().getSkillType() != SkillType.BUFF) //sleep, slow, surrenders etc - e.exit(); - else - { - int rate = 100; - int level = e.getLevel(); - if (level > 0) rate = Integer.valueOf(150/(1 + level)); - if (rate > 95) rate = 95; - else if (rate < 5) rate = 5; - if(Rnd.get(100) < rate) { - e.exit(); - maxfive--; - if(maxfive == 0) break; - } - } + L2PcInstance p = null; + if(target instanceof L2PcInstance) + p = (L2PcInstance) target; + + if(p != null){ + L2Effect[] l = p.getAllEffects(); + int r = Rnd.get(6); + if(l.length < r){} + int i = 0; + for(L2Effect h : l){ + int id = h.getSkill().getId(); + if(id == 4082 || id == 4515 || id == 110 || id == 111 || id == 1323 || id == 1325) + continue; + if(i == r) + break; + + i++; + p.addRemovedBuff(h); + h.exit(); } + ThreadPoolManager.getInstance().scheduleGeneral(new Canc(p,p.getRemovedBuffs()), 6000); } + // Cannot cancel skills 4082, 4215, 4515, 110, 111, 1323, 1325 + } else { if (activeChar instanceof L2PcInstance) Index: java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java =================================================================== --- java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java (revision 5263) +++ java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java (working copy) @@ -408,6 +408,8 @@ /** True if the L2PcInstance is using the relax skill */ private boolean _relax; + + private FastList<L2Effect> removedBuffs = new FastList<L2Effect>(); /** Location before entering Observer Mode */ private int _obsX; @@ -8215,6 +8217,19 @@ return true; } + + public FastList<L2Effect> getRemovedBuffs(){ + return removedBuffs; + } + + public void addRemovedBuff(L2Effect j){ + removedBuffs.add(j); + } + public boolean isNoble() { return _noble; to http://pastebin.com/T8zGJteb ( high 5 client ) i tried but it don't work.. its very different :-? ( in l2pcinstance.java i have add the codes.. but i cannot do it in disablers.java )
0 TouchAndDie Posted May 31, 2012 Author Posted May 31, 2012 Yep, my fault. Try it, should work. Index: java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java =================================================================== --- java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java (revision 167) +++ java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java (working copy) @@ -372,7 +372,25 @@ private static final String RESTORE_TP_BOOKMARK = "SELECT Id,x,y,z,icon,tag,name FROM character_tpbookmark WHERE charId=?"; private static final String DELETE_TP_BOOKMARK = "DELETE FROM character_tpbookmark WHERE charId=? AND Id=?"; + //Cancel return back buffs + private FastList<L2Effect> cancelbuffs = new FastList<L2Effect>(); //wyatt + public boolean isoncanceltask = false; + public FastList<L2Effect> getcancelbuffs() + { + return cancelbuffs; + } + + public void addcancelbuffs(L2Effect effect) + { + cancelbuffs.add(effect); + } + + public void clearcancelbuffs() + { + cancelbuffs.clear(); + } + // Character Subclass SQL String Definitions: private static final String RESTORE_CHAR_SUBCLASSES = "SELECT class_id,exp,sp,level,class_index FROM character_subclasses WHERE charId=? ORDER BY class_index ASC"; private static final String ADD_CHAR_SUBCLASS = "INSERT INTO character_subclasses (charId,class_id,exp,sp,level,class_index) VALUES (?,?,?,?,?,?)"; Index: dist/game/data/scripts/handlers/skillhandlers/Cancel.java =================================================================== --- dist/game/data/scripts/handlers/skillhandlers/Cancel.java (revision 176) +++ dist/game/data/scripts/handlers/skillhandlers/Cancel.java (working copy) @@ -14,7 +14,11 @@ */ package handlers.skillhandlers; +import javolution.util.FastList; + +import com.l2jhidden.game.ThreadPoolManager; import com.l2jhidden.main.Config; +import com.l2jserver.gameserver.datatables.SkillTable; import com.l2jserver.gameserver.handler.ISkillHandler; import com.l2jserver.gameserver.model.L2Effect; import com.l2jserver.gameserver.model.L2Object; @@ -22,6 +26,7 @@ import com.l2jserver.gameserver.model.actor.L2Character; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.L2Summon; +import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; import com.l2jserver.gameserver.skills.Formulas; import com.l2jserver.gameserver.skills.Stats; @@ -43,6 +48,49 @@ * * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[]) */ + +private int minutes = 2; + + class ReturnEffects implements Runnable //wyatt + { + private int _time; + FastList<L2Effect> _list; + L2Character _player; + + public ReturnEffects (int time, L2Character player, FastList<L2Effect>list) + { + _time = time; + _list = list; + _player = player; + } + + @Override + public void run() + { + if (_time > 0) + { + ThreadPoolManager.getInstance().scheduleGeneral(this, 1000); + _time-=1000; + } + + if (_time==0) + { + ((L2PcInstance)_player).stopAllEffectsExceptThoseThatLastThroughDeath(); + + for (L2Effect e : _list) + { + L2Skill skill = SkillTable.getInstance().getInfo(e.getSkill().getId(), e.getLevel()); + + if(skill != null) + { + skill.getEffects(_player, _player); + } + } + ((L2PcInstance)_player).isoncanceltask=false; + } + } + } + @Override public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets) { @@ -133,6 +184,22 @@ final L2Effect[] effects = target.getAllEffects(); + if (target instanceof L2PcInstance) //wyatt + { + ((L2PcInstance)target).clearcancelbuffs(); + + for (L2Effect effect2 : target.getAllEffects()) + { + ((L2PcInstance)target).addcancelbuffs(effect2); + } + + if (((L2PcInstance)target).getcancelbuffs()!=null && !((L2PcInstance)target).isoncanceltask) + { + ((L2PcInstance)target).isoncanceltask=true; + ThreadPoolManager.getInstance().executeTask(new ReturnEffects(minutes * 60000, target, ((L2PcInstance)target).getcancelbuffs())); + } + } + if (skill.getNegateAbnormals() != null) // Cancel for abnormals { for (L2Effect eff : effects) thank you very much, works great ! one more thing when i regain the buffs i get spammed 5-6 times with The effect of X has been removed. The effect of X has been removed. The effect of X has been removed. The effect of X has been removed. how can i solve that ? and how can i add a text when some one get cancelled to get a message like "You will regain your buffs in 10 seconds"
0 ^Wyatt Posted May 31, 2012 Posted May 31, 2012 hmmm :X could be? Index: java/com/l2jserver/gameserver/model/L2Effect.java =================================================================== --- java/com/l2jserver/gameserver/model/L2Effect.java (revision 167) +++ java/com/l2jserver/gameserver/model/L2Effect.java (working copy) @@ -525,9 +525,12 @@ //If the time left is equal to zero, send the message if (_count == 0 && _icon && getEffected() instanceof L2PcInstance) { - SystemMessage smsg3 = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_WORN_OFF); - smsg3.addSkillName(_skill); - getEffected().sendPacket(smsg3); + if (!((L2PcInstance)getEffected()).isoncanceltask) + { + SystemMessage smsg3 = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_WORN_OFF); + smsg3.addSkillName(_skill); + getEffected().sendPacket(smsg3); + } } // if task is null - stopEffectTask does not remove effect if (_currentFuture == null && getEffected() != null)
0 ^Wyatt Posted May 31, 2012 Posted May 31, 2012 try changing this: ((L2PcInstance)_player).isoncanceltask=false; for this: ThreadPoolManager.getInstance().scheduleGeneral(new Runnable() { @Override public void run() { ((L2PcInstance)_player).isoncanceltask=false; } },10000);
0 PoRnosJH Posted May 31, 2012 Posted May 31, 2012 try changing this: ((L2PcInstance)_player).isoncanceltask=false; for this: ThreadPoolManager.getInstance().scheduleGeneral(new Runnable() { @Override public void run() { ((L2PcInstance)_player).isoncanceltask=false; } },10000); where this code is? ((L2PcInstance)_player).isoncanceltask=false; no in L2Effects or L2Cancel at L2J Freya Also Bugs atm : 1. When the given time pass and you are supposed to get back the cancelled buffs .. all your buffs (cancelled+current) refresh their buff time.. like if you have a song/dance for 3min .. then you get cancel at the 10sec before it vanish .. and you lost other buffs ..then when the time comes you get all the lost buffs + this song/dance to their starting buff time.. 2. If you have for example buffs : might , haste , focus , Shield And you get cancelled 2 buffs .. and you remain with : might,haste then you make something like selfbuff or ud or someone else buffs you.. And when the time is to returns the lost buffs (focus , Shield) .. you get them back but NO the new buff you took..it vanishes So your Buffs will be : might , haste , focus , shield Any buff like skill you do to your self like ud for example will not lasts for the time it has to.. it will vanish when the lost buffs returns.. 3. Spam in Chat " #Buff# Removed!" for each buff around 2-3 time in random place Ty for your Help ^Wyatt !!
0 insaNNe Posted May 31, 2012 Posted May 31, 2012 PoRnosJH, ((L2PcInstance)_player).isoncanceltask=false; is in cancel.java. it should work, test it :)
0 PoRnosJH Posted June 1, 2012 Posted June 1, 2012 PoRnosJH, ((L2PcInstance)_player).isoncanceltask=false; is in cancel.java. it should work, test it :) Oh .. ty i locate it ... weird i already searched in there :) But.. It doesnt fix the number #3 Bug .. still exists
0 ^Wyatt Posted June 1, 2012 Posted June 1, 2012 @PoRnosJH It should solve the 3 problems, try it and feedback :x ### Eclipse Workspace Patch 1.0 #P L2JH_DataPack Index: dist/game/data/scripts/handlers/skillhandlers/Cancel.java =================================================================== --- dist/game/data/scripts/handlers/skillhandlers/Cancel.java (revision 176) +++ dist/game/data/scripts/handlers/skillhandlers/Cancel.java (working copy) @@ -14,7 +14,9 @@ */ package handlers.skillhandlers; +import javolution.util.FastList; import com.l2jhidden.main.Config; +import com.l2jserver.gameserver.datatables.SkillTable; import com.l2jserver.gameserver.handler.ISkillHandler; import com.l2jserver.gameserver.model.L2Effect; import com.l2jserver.gameserver.model.L2Object; @@ -22,6 +24,7 @@ import com.l2jserver.gameserver.model.actor.L2Character; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.L2Summon; +import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; import com.l2jserver.gameserver.skills.Formulas; import com.l2jserver.gameserver.skills.Stats; @@ -43,6 +46,36 @@ * * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[]) */ + + private int seconds = 120; + + private static void waitS(int seconds) + { + try + { + Thread.sleep(1000*seconds); + } + + catch (InterruptedException ie) + { + + } + } + + private void returnbuffs (L2Character player, FastList<L2Effect>list) + { + for (L2Effect e : list) + { + L2Skill skill = SkillTable.getInstance().getInfo(e.getSkill().getId(), e.getLevel()); + + if(skill != null) + { + skill.getEffects(player, player); + } + } + ((L2PcInstance)player).isoncanceltask=false; + } + @Override public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets) { @@ -132,6 +166,7 @@ } final L2Effect[] effects = target.getAllEffects(); + ((L2PcInstance)target).clearcancelbuffs(); if (skill.getNegateAbnormals() != null) // Cancel for abnormals { @@ -178,6 +213,11 @@ continue; lastCanceledSkillId = effect.getSkill().getId(); + + if (target instanceof L2PcInstance) + { + ((L2PcInstance)target).addcancelbuffs(effect); + } effect.exit(); count--; @@ -208,6 +248,11 @@ continue; lastCanceledSkillId = effect.getSkill().getId(); + + if (target instanceof L2PcInstance) + { + ((L2PcInstance)target).addcancelbuffs(effect); + } effect.exit(); count--; @@ -216,9 +261,15 @@ } } } - //Possibility of a lethal strike Formulas.calcLethalHit(activeChar, target, skill); + + if (target instanceof L2PcInstance && ((L2PcInstance)target).getcancelbuffs()!=null && !((L2PcInstance)target).isoncanceltask) + { + ((L2PcInstance)target).sendMessage("You'll get back your cancelled buffs in "+seconds+" seconds."); + ((L2PcInstance)target).isoncanceltask=true; + waitS(seconds); + returnbuffs(target, ((L2PcInstance)target).getcancelbuffs()); + } } // Applying self-effects
0 TouchAndDie Posted June 1, 2012 Author Posted June 1, 2012 ok it solved the 3 bugs but now the attacker get stucked 15 seconds :-?
0 ^Wyatt Posted June 1, 2012 Posted June 1, 2012 try to move waitS(seconds); and put it inside : private void returnbuffs (L2Character player, FastList<L2Effect>list) { waitS(seconds); for (L2Effect e : list)
0 TouchAndDie Posted June 1, 2012 Author Posted June 1, 2012 try to move waitS(seconds); and put it inside : private void returnbuffs (L2Character player, FastList<L2Effect>list) { waitS(seconds); for (L2Effect e : list) not workin'
0 ^Wyatt Posted June 1, 2012 Posted June 1, 2012 It should be the final one (bored :x): Index: dist/game/data/scripts/handlers/skillhandlers/Cancel.java =================================================================== --- dist/game/data/scripts/handlers/skillhandlers/Cancel.java (revision 176) +++ dist/game/data/scripts/handlers/skillhandlers/Cancel.java (working copy) @@ -14,7 +14,11 @@ */ package handlers.skillhandlers; +import javolution.util.FastList; + +import com.l2jhidden.game.ThreadPoolManager; import com.l2jhidden.main.Config; +import com.l2jserver.gameserver.datatables.SkillTable; import com.l2jserver.gameserver.handler.ISkillHandler; import com.l2jserver.gameserver.model.L2Effect; import com.l2jserver.gameserver.model.L2Object; @@ -22,6 +26,7 @@ import com.l2jserver.gameserver.model.actor.L2Character; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.L2Summon; +import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; import com.l2jserver.gameserver.skills.Formulas; import com.l2jserver.gameserver.skills.Stats; @@ -43,6 +48,23 @@ * * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[]) */ + + private int seconds = 5; + + private void returnbuffs (L2Character player, FastList<L2Effect>list) + { + for (L2Effect e : list) + { + L2Skill skill = SkillTable.getInstance().getInfo(e.getSkill().getId(), e.getLevel()); + + if(skill != null) + { + skill.getEffects(player, player); + } + } + ((L2PcInstance)player).isoncanceltask=false; + } + @Override public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets) { @@ -75,10 +98,9 @@ ((L2Npc)activeChar)._spiritshotcharged = false; } - L2Character target; L2Effect effect; final int cancelLvl, minRate, maxRate; cancelLvl = skill.getMagicLevel(); minRate = 25; maxRate = 80; @@ -87,8 +109,9 @@ { if (!(obj instanceof L2Character)) continue; - target = (L2Character)obj; + final L2Character target = (L2Character)obj; if (target.isDead()) continue; @@ -132,6 +155,7 @@ } final L2Effect[] effects = target.getAllEffects(); + ((L2PcInstance)target).clearcancelbuffs(); if (skill.getNegateAbnormals() != null) // Cancel for abnormals { @@ -178,6 +202,11 @@ continue; lastCanceledSkillId = effect.getSkill().getId(); + + if (target instanceof L2PcInstance) + { + ((L2PcInstance)target).addcancelbuffs(effect); + } effect.exit(); count--; @@ -208,6 +237,11 @@ continue; lastCanceledSkillId = effect.getSkill().getId(); + + if (target instanceof L2PcInstance) + { + ((L2PcInstance)target).addcancelbuffs(effect); + } effect.exit(); count--; @@ -216,9 +250,23 @@ } } } - //Possibility of a lethal strike Formulas.calcLethalHit(activeChar, target, skill); + + if (target instanceof L2PcInstance && ((L2PcInstance)target).getcancelbuffs()!=null && !((L2PcInstance)target).isoncanceltask) + { + ((L2PcInstance)target).sendMessage("You will get back your buffs in "+seconds+" seconds."); + + ThreadPoolManager.getInstance().scheduleGeneral(new Runnable() + { + @Override + public void run() + { + ((L2PcInstance)target).isoncanceltask=true; + returnbuffs(target, ((L2PcInstance)target).getcancelbuffs()); + } + },seconds * 1000); + } } // Applying self-effects
0 TouchAndDie Posted June 1, 2012 Author Posted June 1, 2012 It should be the final one (bored :x): Index: dist/game/data/scripts/handlers/skillhandlers/Cancel.java =================================================================== --- dist/game/data/scripts/handlers/skillhandlers/Cancel.java (revision 176) +++ dist/game/data/scripts/handlers/skillhandlers/Cancel.java (working copy) @@ -14,7 +14,11 @@ */ package handlers.skillhandlers; +import javolution.util.FastList; + +import com.l2jhidden.game.ThreadPoolManager; import com.l2jhidden.main.Config; +import com.l2jserver.gameserver.datatables.SkillTable; import com.l2jserver.gameserver.handler.ISkillHandler; import com.l2jserver.gameserver.model.L2Effect; import com.l2jserver.gameserver.model.L2Object; @@ -22,6 +26,7 @@ import com.l2jserver.gameserver.model.actor.L2Character; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.L2Summon; +import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.item.instance.L2ItemInstance; import com.l2jserver.gameserver.skills.Formulas; import com.l2jserver.gameserver.skills.Stats; @@ -43,6 +48,23 @@ * * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[]) */ + + private int seconds = 5; + + private void returnbuffs (L2Character player, FastList<L2Effect>list) + { + for (L2Effect e : list) + { + L2Skill skill = SkillTable.getInstance().getInfo(e.getSkill().getId(), e.getLevel()); + + if(skill != null) + { + skill.getEffects(player, player); + } + } + ((L2PcInstance)player).isoncanceltask=false; + } + @Override public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets) { @@ -75,10 +98,9 @@ ((L2Npc)activeChar)._spiritshotcharged = false; } - L2Character target; L2Effect effect; final int cancelLvl, minRate, maxRate; cancelLvl = skill.getMagicLevel(); minRate = 25; maxRate = 80; @@ -87,8 +109,9 @@ { if (!(obj instanceof L2Character)) continue; - target = (L2Character)obj; + final L2Character target = (L2Character)obj; if (target.isDead()) continue; @@ -132,6 +155,7 @@ } final L2Effect[] effects = target.getAllEffects(); + ((L2PcInstance)target).clearcancelbuffs(); if (skill.getNegateAbnormals() != null) // Cancel for abnormals { @@ -178,6 +202,11 @@ continue; lastCanceledSkillId = effect.getSkill().getId(); + + if (target instanceof L2PcInstance) + { + ((L2PcInstance)target).addcancelbuffs(effect); + } effect.exit(); count--; @@ -208,6 +237,11 @@ continue; lastCanceledSkillId = effect.getSkill().getId(); + + if (target instanceof L2PcInstance) + { + ((L2PcInstance)target).addcancelbuffs(effect); + } effect.exit(); count--; @@ -216,9 +250,23 @@ } } } - //Possibility of a lethal strike Formulas.calcLethalHit(activeChar, target, skill); + + if (target instanceof L2PcInstance && ((L2PcInstance)target).getcancelbuffs()!=null && !((L2PcInstance)target).isoncanceltask) + { + ((L2PcInstance)target).sendMessage("You will get back your buffs in "+seconds+" seconds."); + + ThreadPoolManager.getInstance().scheduleGeneral(new Runnable() + { + @Override + public void run() + { + ((L2PcInstance)target).isoncanceltask=true; + returnbuffs(target, ((L2PcInstance)target).getcancelbuffs()); + } + },seconds * 1000); + } } // Applying self-effects working thank you very much !!
0 PoRnosJH Posted June 1, 2012 Posted June 1, 2012 Working ... !!! Ty Man ! really good work and a nice code ! GJ ! Minor Bugs atm : 1. After you get cancelled.. removed buffs when returns you get them at their full bufftime ... it would be better if you can make it like they returns on their earlier bufftime... example (atm) : you got Talisman-Divine Protection you activate it and have it for 5sec.. so in 4 sec it wil disappears .. but if at that time you get cancel ..then it gets cancelled...and returns in full 9 seconds ... Isnt a big thing but this will complete the code for now ... Thank you again for your time and work!
Question
TouchAndDie
how can i add this :
### Eclipse Workspace Patch 1.0 #P Chr.6GMS Index: java/net/sf/l2j/gameserver/handler/skillhandlers/Disablers.java =================================================================== --- java/net/sf/l2j/gameserver/handler/skillhandlers/Disablers.java (revision 5263) +++ java/net/sf/l2j/gameserver/handler/skillhandlers/Disablers.java (working copy) @@ -22,9 +22,13 @@ import java.util.logging.Level; import java.util.logging.Logger; +import javolution.util.FastList; + +import net.sf.l2j.gameserver.ThreadPoolManager; import net.sf.l2j.gameserver.ai.CtrlEvent; import net.sf.l2j.gameserver.ai.CtrlIntention; import net.sf.l2j.gameserver.ai.L2AttackableAI; +import net.sf.l2j.gameserver.datatables.SkillTable; import net.sf.l2j.gameserver.handler.ISkillHandler; import net.sf.l2j.gameserver.handler.SkillHandler; import net.sf.l2j.gameserver.model.L2Attackable; @@ -66,6 +70,28 @@ private float _negatePower=0.f; private int _negateId=0; + public class Canc implements Runnable{ + L2PcInstance j; + FastList<L2Effect> l; + + public Canc(L2PcInstance p,FastList<L2Effect> f){ + j = p; + l = f; + } + + public void run(){ + if(l.isEmpty()) + return; + for(L2Effect b : l) + { + L2Skill k = SkillTable.getInstance().getInfo(b.getSkill().getId(), b.getLevel()); + if(k != null) + k.getEffects(j, j); + } + l.clear(); + } + } + @Override public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets) { @@ -454,31 +480,30 @@ if(Rnd.get(100) < landrate) { - L2Effect[] effects = target.getAllEffects(); - int maxfive = 5; - for (L2Effect e : effects) - { - if (e.getSkill().getId() != 4082 && e.getSkill().getId() != 4215 && - e.getSkill().getId() != 4515 && e.getSkill().getId() != 110 && e.getSkill().getId() != 111 && - e.getSkill().getId() != 1323 && e.getSkill().getId() != 1325) // Cannot cancel skills 4082, 4215, 4515, 110, 111, 1323, 1325 - { - if(e.getSkill().getSkillType() != SkillType.BUFF) //sleep, slow, surrenders etc - e.exit(); - else - { - int rate = 100; - int level = e.getLevel(); - if (level > 0) rate = Integer.valueOf(150/(1 + level)); - if (rate > 95) rate = 95; - else if (rate < 5) rate = 5; - if(Rnd.get(100) < rate) { - e.exit(); - maxfive--; - if(maxfive == 0) break; - } - } + L2PcInstance p = null; + if(target instanceof L2PcInstance) + p = (L2PcInstance) target; + + if(p != null){ + L2Effect[] l = p.getAllEffects(); + int r = Rnd.get(6); + if(l.length < r){} + int i = 0; + for(L2Effect h : l){ + int id = h.getSkill().getId(); + if(id == 4082 || id == 4515 || id == 110 || id == 111 || id == 1323 || id == 1325) + continue; + if(i == r) + break; + + i++; + p.addRemovedBuff(h); + h.exit(); } + ThreadPoolManager.getInstance().scheduleGeneral(new Canc(p,p.getRemovedBuffs()), 6000); } + // Cannot cancel skills 4082, 4215, 4515, 110, 111, 1323, 1325 + } else { if (activeChar instanceof L2PcInstance) Index: java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java =================================================================== --- java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java (revision 5263) +++ java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java (working copy) @@ -408,6 +408,8 @@ /** True if the L2PcInstance is using the relax skill */ private boolean _relax; + + private FastList<L2Effect> removedBuffs = new FastList<L2Effect>(); /** Location before entering Observer Mode */ private int _obsX; @@ -8215,6 +8217,19 @@ return true; } + + public FastList<L2Effect> getRemovedBuffs(){ + return removedBuffs; + } + + public void addRemovedBuff(L2Effect j){ + removedBuffs.add(j); + } + public boolean isNoble() { return _noble;to http://pastebin.com/T8zGJteb
( high 5 client ) i tried but it don't work.. its very different :-?
( in l2pcinstance.java i have add the codes.. but i cannot do it in disablers.java )
30 answers to this question
Recommended Posts