This community uses essential cookies to function properly. Non-essential cookies and third-party services are used only with your consent. Read our Privacy Policy and We have placed cookies on your device to help make this website better. You can adjust your cookie settings, otherwise we'll assume you're okay to continue..
Question
colt
Hey guys, can you help me fix this errors?
I want to add the Phoenix Engine on my revision based on L2JServer, so, step-by-step i change this:
1- Fix the code of core-patch.diff to be available on my revision:
Index: java/com/bit/gameserver/network/serverpackets/Die.java =================================================================== --- java/com/bit/gameserver/network/serverpackets/Die.java (revision 4966) +++ java/com/bit/gameserver/network/serverpackets/Die.java (working copy) @@ -14,6 +14,8 @@ */ package com.bit.gameserver.network.serverpackets; +import net.phoenixengine.PhoenixInterface; + import com.bit.gameserver.datatables.AccessLevels; import com.bit.gameserver.instancemanager.CHSiegeManager; import com.bit.gameserver.instancemanager.CastleManager; @@ -67,6 +69,11 @@ } _charObjId = cha.getObjectId(); _canTeleport = !((cha instanceof L2PcInstance && TvTEvent.isStarted() && TvTEvent.isPlayerParticipant(_charObjId)) || cha.isPendingRevive()); + + if(cha instanceof L2PcInstance) + if(PhoenixInterface.isParticipating(cha.getObjectId())) + _canTeleport = false; + if (cha instanceof L2Attackable) _sweepable = ((L2Attackable)cha).isSweepActive(); Index: java/com/bit/gameserver/GameServer.java =================================================================== --- java/com/bit/gameserver/GameServer.java (revision 4966) +++ java/com/bit/gameserver/GameServer.java (working copy) @@ -27,6 +27,9 @@ import java.util.logging.LogManager; import java.util.logging.Logger; +import net.phoenixengine.Main; +import net.phoenixengine.PhoenixInterface; + import org.mmocore.network.SelectorConfig; import org.mmocore.network.SelectorThread; @@ -413,6 +416,10 @@ long freeMem = (Runtime.getRuntime().maxMemory() - Runtime.getRuntime().totalMemory() + Runtime.getRuntime().freeMemory()) / 1048576; long totalMem = Runtime.getRuntime().maxMemory() / 1048576; _log.info("GameServer Started, free memory " + freeMem + " Mb of " + totalMem + " Mb"); + + Main.main(); + PhoenixInterface.start(); + Toolkit.getDefaultToolkit().beep(); _loginThread = LoginServerThread.getInstance(); Index: java/com/bit/gameserver/network/clientpackets/UseItem.java =================================================================== --- java/com/bit/gameserver/network/clientpackets/UseItem.java (revision 4966) +++ java/com/bit/gameserver/network/clientpackets/UseItem.java (working copy) @@ -17,6 +17,8 @@ import java.util.logging.Level; import java.util.logging.Logger; +import net.phoenixengine.PhoenixInterface; + import com.bit.Config; import com.bit.gameserver.GameTimeController; import com.bit.gameserver.ThreadPoolManager; @@ -186,6 +188,10 @@ return; } + if(PhoenixInterface.isParticipating(activeChar.getObjectId())) + if(!PhoenixInterface.onUseItem(activeChar.getObjectId(),item.getItemId(),item.getObjectId())) + return; + // Equip or unEquip if (FortSiegeManager.getInstance().isCombat(item.getItemId())) return; //no message Index: java/com/bit/gameserver/model/actor/instance/L2PcInstance.java =================================================================== --- java/com/bit/gameserver/model/actor/instance/L2PcInstance.java (revision 4966) +++ java/com/bit/gameserver/model/actor/instance/L2PcInstance.java (working copy) @@ -37,6 +37,7 @@ import javolution.util.FastList; import javolution.util.FastMap; import javolution.util.FastSet; +import net.phoenixengine.PhoenixInterface; import com.bit.Config; import com.bit.L2DatabaseFactory; @@ -739,6 +740,8 @@ private byte _handysBlockCheckerEventArena = -1; + public boolean eventSitForced = false; + /** new loto ticket **/ private final int _loto[] = new int[5]; //public static int _loto_nums[] = {0,1,2,3,4,5,6,7,8,9,}; @@ -3209,7 +3212,7 @@ */ public void standUp() { - if (L2Event.isParticipant(this) && getEventStatus().eventSitForced) + if (PhoenixInterface.isParticipating(getObjectId()) && eventSitForced) { sendMessage("A dark force beyond your mortal understanding makes your knees to shake when you try to stand up..."); } @@ -5159,6 +5162,13 @@ } } + if(newTarget instanceof L2PcInstance) + { + L2PcInstance player = (L2PcInstance)newTarget; + if(!PhoenixInterface.canTargetPlayer(getObjectId(), player.getObjectId())) + return; + } + // Get the current target L2Object oldTarget = getTarget(); @@ -5448,6 +5458,13 @@ TvTEvent.onKill(killer, this); + if(pk != null) + if(PhoenixInterface.isParticipating(getObjectId()) && PhoenixInterface.isParticipating(pk.getObjectId())) + { + PhoenixInterface.onKill(getObjectId(),pk.getObjectId()); + PhoenixInterface.onDie(getObjectId(),pk.getObjectId()); + } + if (L2Event.isParticipant(pk) && pk != null) pk.getEventStatus().kills.add(this); @@ -8700,6 +8717,15 @@ return false; } + /*if(PhoenixInterface.isParticipating(getObjectId())) + { + if(!PhoenixInterface.canUseSkill(getObjectId(), skill.getId())) + { + sendPacket(ActionFailed.STATIC_PACKET); + return false; + } + }*/ + //************************************* Check Casting in Progress ******************************************* // If a skill is currently being used, queue this one if this is not the same @@ -10767,6 +10793,9 @@ try { + if(PhoenixInterface.isRegistered(getObjectId())) + return false; + // Cannot switch or change subclasses while transformed if (_transformation != null) return false; @@ -11999,6 +12028,17 @@ _log.log(Level.SEVERE, "deleteMe()", e); } + try + { + PhoenixInterface.onLogout(getObjectId()); + if(PhoenixInterface.isParticipating(getObjectId())) + PhoenixInterface.eventOnLogout(getObjectId()); + } + catch (Exception e) + { + e.printStackTrace(); + } + if (getClanId() > 0) getClan().broadcastToOtherOnlineMembers(new PledgeShowMemberListUpdate(this), this); //ClanTable.getInstance().getClan(getClanId()).broadcastToOnlineMembers(new PledgeShowMemberListAdd(this)); Index: java/com/bit/gameserver/Shutdown.java =================================================================== --- java/com/bit/gameserver/Shutdown.java (revision 4966) +++ java/com/bit/gameserver/Shutdown.java (working copy) @@ -19,6 +19,8 @@ import java.util.logging.Level; import java.util.logging.Logger; +import net.phoenixengine.PhoenixInterface; + import com.bit.Config; import com.bit.L2DatabaseFactory; import com.bit.gameserver.datatables.ClanTable; @@ -581,6 +583,8 @@ GlobalVariablesManager.getInstance().saveVars(); _log.info("Global Variables Manager: Variables saved("+tc.getEstimatedTimeAndRestartCounter()+"ms)."); + PhoenixInterface.shutdown(); + //Save items on ground before closing if (Config.SAVE_DROPPED_ITEM) { Index: java/com/bit/gameserver/model/skills/L2Skill.java =================================================================== --- java/com/bit/gameserver/model/skills/L2Skill.java (revision 4966) +++ java/com/bit/gameserver/model/skills/L2Skill.java (working copy) @@ -21,6 +21,8 @@ import java.util.logging.Level; import java.util.logging.Logger; +import net.phoenixengine.PhoenixInterface; + import javolution.util.FastList; import javolution.util.FastMap; @@ -1549,6 +1551,10 @@ if (!TvTEvent.checkForTvTSkill(player, targetPlayer, skill)) return false; + + if(PhoenixInterface.isParticipating(player.getObjectId()) && PhoenixInterface.isParticipating(targetPlayer.getObjectId())) + if(PhoenixInterface.areTeammates(player.getObjectId(), targetPlayer.getObjectId())) + return false; if (!sourceInArena && !(targetPlayer.isInsideZone(L2Character.ZONE_PVP) && !targetPlayer.isInsideZone(L2Character.ZONE_SIEGE))) { Index: java/com/bit/gameserver/model/skills/L2SkillType.java =================================================================== --- java/com/bit/gameserver/model/skills/L2SkillType.java (revision 4966) +++ java/com/bit/gameserver/model/skills/L2SkillType.java (working copy) @@ -45,6 +45,8 @@ public enum L2SkillType { // Damage + BOMB, + CAPTURE, PDAM, MDAM, CPDAM, Index: java/com/bit/gameserver/network/clientpackets/Say2.java =================================================================== --- java/com/bit/gameserver/network/clientpackets/Say2.java (revision 4966) +++ java/com/bit/gameserver/network/clientpackets/Say2.java (working copy) @@ -18,6 +18,8 @@ import java.util.logging.LogRecord; import java.util.logging.Logger; +import net.phoenixengine.PhoenixInterface; + import com.bit.Config; import com.bit.gameserver.handler.ChatHandler; import com.bit.gameserver.handler.IChatHandler; @@ -175,6 +177,9 @@ } } + if(PhoenixInterface.isParticipating(activeChar.getObjectId())) + PhoenixInterface.onSay(_type, activeChar.getObjectId(), _text); + if (_type == PETITION_PLAYER && activeChar.isGM()) _type = PETITION_GM; Index: java/com/bit/gameserver/model/actor/L2Character.java =================================================================== --- java/com/bit/gameserver/model/actor/L2Character.java (revision 4966) +++ java/com/bit/gameserver/model/actor/L2Character.java (working copy) @@ -24,6 +24,8 @@ import java.util.logging.Level; import java.util.logging.Logger; +import net.phoenixengine.PhoenixInterface; + import javolution.util.FastList; import javolution.util.WeakFastSet; @@ -744,6 +746,20 @@ */ protected void doAttack(L2Character target) { + + if(this instanceof L2PcInstance && PhoenixInterface.doAttack(getObjectId(), target.getObjectId())) + { + sendPacket(ActionFailed.STATIC_PACKET); + return; + } + + if(this instanceof L2Summon && PhoenixInterface.doAttack(((L2Summon)this).getOwner().getObjectId(), target.getObjectId())) + { + sendPacket(ActionFailed.STATIC_PACKET); + return; + } + + if (Config.DEBUG) _log.fine(getName() + " doAttack: target=" + target); @@ -1043,6 +1059,10 @@ else if (weaponInst != null) weaponInst.setChargedSoulshot(L2ItemInstance.CHARGED_NONE); + if(this instanceof L2PcInstance && target instanceof L2PcInstance) + if(PhoenixInterface.isParticipating(getObjectId())) + PhoenixInterface.onHit(getObjectId(), target.getObjectId()); + if (player != null) { if (player.isCursedWeaponEquipped()) @@ -1580,6 +1600,95 @@ private void beginCast(L2Skill skill, boolean simultaneously) { + + if(this instanceof L2PcInstance) + if(PhoenixInterface.isParticipating(getObjectId())) + { + + if(this.getTarget() instanceof L2PcInstance) + if(PhoenixInterface.areTeammates(getObjectId(), getTarget().getObjectId()) && !PhoenixInterface.getBoolean("friendlyFireEnabled",0) && skill.isOffensive()) + { + if (simultaneously) + setIsCastingSimultaneouslyNow(false); + else + setIsCastingNow(false); + + sendPacket(ActionFailed.STATIC_PACKET); + getAI().setIntention(AI_INTENTION_ACTIVE); + + return; + } + + if(getTarget() != null) + if(!PhoenixInterface.canAttack(getObjectId(), getTarget().getObjectId()) && skill.isOffensive()) + { + if (simultaneously) + setIsCastingSimultaneouslyNow(false); + else + setIsCastingNow(false); + + sendPacket(ActionFailed.STATIC_PACKET); + getAI().setIntention(AI_INTENTION_ACTIVE); + + return; + } + + if(!PhoenixInterface.onUseMagic(this.getObjectId(), skill.getId())) + { + if (simultaneously) + setIsCastingSimultaneouslyNow(false); + else + setIsCastingNow(false); + + sendPacket(ActionFailed.STATIC_PACKET); + getAI().setIntention(AI_INTENTION_ACTIVE); + + return; + } + } + + + if(this instanceof L2Summon) + { + if(PhoenixInterface.isParticipating(((L2Summon)this).getOwner().getObjectId())) + { + if(this.getTarget() instanceof L2PcInstance) + if(PhoenixInterface.areTeammates(((L2Summon)this).getOwner().getObjectId(), getTarget().getObjectId()) && !PhoenixInterface.getBoolean("friendlyFireEnabled",0) && skill.isOffensive()) + { + if (simultaneously) + setIsCastingSimultaneouslyNow(false); + else + setIsCastingNow(false); + + return; + } + + if(!PhoenixInterface.canAttack(((L2Summon)this).getOwner().getObjectId(), this.getTarget().getObjectId())) + { + if (simultaneously) + setIsCastingSimultaneouslyNow(false); + else + setIsCastingNow(false); + + return; + } + + if(!PhoenixInterface.onUseMagic(((L2Summon)this).getOwner().getObjectId(), skill.getId())) + { + if (simultaneously) + setIsCastingSimultaneouslyNow(false); + else + setIsCastingNow(false); + + sendPacket(ActionFailed.STATIC_PACKET); + getAI().setIntention(AI_INTENTION_ACTIVE); + + return; + } + + } + } + if (!checkDoCastConditions(skill)) { if (simultaneously) Index: java/com/bit/gameserver/model/olympiad/OlympiadManager.java =================================================================== --- java/com/bit/gameserver/model/olympiad/OlympiadManager.java (revision 4966) +++ java/com/bit/gameserver/model/olympiad/OlympiadManager.java (working copy) @@ -18,6 +18,8 @@ import java.util.List; import java.util.Map; +import net.phoenixengine.PhoenixInterface; + import javolution.util.FastList; import javolution.util.FastMap; @@ -461,6 +463,12 @@ return false; } + if(PhoenixInterface.isRegistered(noble.getObjectId())) + { + noble.sendMessage("You can't join olympiad while participating on an Event."); + return false; + } + if (isRegistered(noble, player, true)) return false; Index: java/com/bit/gameserver/network/clientpackets/Logout.java =================================================================== --- java/com/bit/gameserver/network/clientpackets/Logout.java (revision 4966) +++ java/com/bit/gameserver/network/clientpackets/Logout.java (working copy) @@ -18,6 +18,8 @@ import java.util.logging.LogRecord; import java.util.logging.Logger; +import net.phoenixengine.PhoenixInterface; + import com.bit.Config; import com.bit.gameserver.SevenSignsFestival; import com.bit.gameserver.model.L2Party; @@ -83,6 +85,12 @@ return; } + if(PhoenixInterface.logout(player.getObjectId())) + { + sendPacket(ActionFailed.STATIC_PACKET); + return; + } + // Prevent player from logging out if they are a festival participant // and it is in progress, otherwise notify party members that the player // is not longer a participant. Index: java/com/bit/gameserver/model/actor/L2Npc.java =================================================================== --- java/com/bit/gameserver/model/actor/L2Npc.java (revision 4966) +++ java/com/bit/gameserver/model/actor/L2Npc.java (working copy) @@ -19,6 +19,8 @@ import java.util.Collection; import java.util.logging.Level; +import net.phoenixengine.PhoenixInterface; + import javolution.util.FastList; import com.bit.Config; @@ -1314,6 +1316,19 @@ break; } + if(PhoenixInterface.talkNpc(player.getObjectId(),getObjectId())) + return; + + if (npcId == PhoenixInterface.getInt("managerNpcId", 0)) + { + PhoenixInterface.showFirstHtml(player.getObjectId(), getObjectId()); + return; + } + + if (PhoenixInterface.isParticipating(player.getObjectId())) + if (PhoenixInterface.onTalkNpc(getObjectId(), player.getObjectId())) + return; + // Send a Server->Client NpcHtmlMessage containing the text of the L2NpcInstance to the L2PcInstance NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), filename); Index: java/com/bit/gameserver/network/clientpackets/RequestRestart.java =================================================================== --- java/com/bit/gameserver/network/clientpackets/RequestRestart.java (revision 4966) +++ java/com/bit/gameserver/network/clientpackets/RequestRestart.java (working copy) @@ -18,6 +18,8 @@ import java.util.logging.LogRecord; import java.util.logging.Logger; +import net.phoenixengine.PhoenixInterface; + import com.bit.Config; import com.bit.gameserver.SevenSignsFestival; import com.bit.gameserver.instancemanager.AntiFeedManager; @@ -86,6 +88,12 @@ return; } + if(PhoenixInterface.logout(player.getObjectId())) + { + sendPacket(RestartResponse.valueOf(false)); + return; + } + // Prevent player from restarting if they are a festival participant // and it is in progress, otherwise notify party members that the player // is not longer a participant. Index: java/com/bit/gameserver/network/clientpackets/RequestBypassToServer.java =================================================================== --- java/com/bit/gameserver/network/clientpackets/RequestBypassToServer.java (revision 4966) +++ java/com/bit/gameserver/network/clientpackets/RequestBypassToServer.java (working copy) @@ -18,6 +18,8 @@ import java.util.logging.Level; import java.util.logging.Logger; +import net.phoenixengine.PhoenixInterface; + import com.bit.Config; import com.bit.gameserver.ai.CtrlIntention; import com.bit.gameserver.communitybbs.CommunityBoard; @@ -247,6 +249,10 @@ Hero.getInstance().showHeroDiary(player, heroclass, heroid, heropage); } } + else if (_command.startsWith("phoenix ")) + { + PhoenixInterface.bypass(activeChar.getObjectId(),_command.substring(8)); + } else { final IBypassHandler handler = BypassHandler.getInstance().getBypassHandler(_command); Index: java/com/bit/gameserver/model/skills/l2skills/L2SkillTeleport.java =================================================================== --- java/com/bit/gameserver/model/skills/l2skills/L2SkillTeleport.java (revision 4966) +++ java/com/bit/gameserver/model/skills/l2skills/L2SkillTeleport.java (working copy) @@ -16,6 +16,8 @@ import java.util.logging.Level; +import net.phoenixengine.PhoenixInterface; + import com.bit.gameserver.instancemanager.GrandBossManager; import com.bit.gameserver.instancemanager.MapRegionManager; import com.bit.gameserver.model.L2Object; @@ -64,6 +66,12 @@ return; } + if(PhoenixInterface.isParticipating(activeChar.getObjectId())) + { + activeChar.sendPacket(ActionFailed.STATIC_PACKET); + return; + } + if (activeChar.isAfraid()) { activeChar.sendPacket(ActionFailed.STATIC_PACKET); @@ -104,6 +112,9 @@ continue; } + if(PhoenixInterface.isParticipating(targetChar.getObjectId())) + continue; + // Check to see if player is in jail if (targetChar.isInJail()) { Index: .classpath =================================================================== --- .classpath (revision 4966) +++ .classpath (working copy) @@ -1,20 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="java" /> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" /> - <classpathentry kind="lib" path="dist/libs/c3p0-0.9.2-pre5.jar" /> - <classpathentry kind="lib" path="dist/libs/javolution-5.5.1.jar" sourcepath="dist/libs/javolution-5.5.1-src.zip" /> - <classpathentry kind="lib" path="dist/libs/jna.jar" /> - <classpathentry kind="lib" path="dist/libs/jython.jar" /> - <classpathentry kind="lib" path="dist/libs/jython-engine-2.2.1.jar" /> - <classpathentry kind="lib" path="dist/libs/mail.jar" /> - <classpathentry kind="lib" path="dist/libs/mailapi.jar" /> - <classpathentry kind="lib" path="dist/libs/mchange-commons-java-0.2.3.jar" /> - <classpathentry kind="lib" path="dist/libs/mmocore.jar" /> - <classpathentry kind="lib" path="dist/libs/netcon-1.7.jar" /> - <classpathentry kind="lib" path="dist/libs/smtp.jar" /> - <classpathentry kind="lib" path="dist/libs/trove-3.0.3.jar" /> - <classpathentry kind="lib" path="dist/libs/Subnet.jar" /> - <classpathentry kind="output" path="bin" /> + <classpathentry kind="src" path="java" /> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" /> + <classpathentry kind="lib" path="dist/libs/c3p0-0.9.2-pre5.jar" /> + <classpathentry kind="lib" path="dist/libs/javolution-5.5.1.jar" sourcepath="dist/libs/javolution-5.5.1-src.zip" /> + <classpathentry kind="lib" path="dist/libs/jna.jar" /> + <classpathentry kind="lib" path="dist/libs/jython.jar" /> + <classpathentry kind="lib" path="dist/libs/jython-engine-2.2.1.jar" /> + <classpathentry kind="lib" path="dist/libs/mail.jar" /> + <classpathentry kind="lib" path="dist/libs/mailapi.jar" /> + <classpathentry kind="lib" path="dist/libs/mchange-commons-java-0.2.3.jar" /> + <classpathentry kind="lib" path="dist/libs/mmocore.jar" /> + <classpathentry kind="lib" path="dist/libs/netcon-1.7.jar" /> + <classpathentry kind="lib" path="dist/libs/smtp.jar" /> + <classpathentry kind="lib" path="dist/libs/trove-3.0.3.jar" /> + <classpathentry kind="lib" path="dist/libs/phoenix.jar" /> + <classpathentry kind="lib" path="dist/libs/Subnet.jar" /> + <classpathentry kind="output" path="bin" /> </classpath>2- I put the file phoenix.jar on dist/libs folder;
3- When I try do compile I get this errors:
Buildfile: C:\Users\Familia\servicos\Core\build.xml checkRequirements: getChangelogDateVersion: init: [delete] Deleting directory C:\Users\Familia\servicos\Core\build\bin [mkdir] Created dir: C:\Users\Familia\servicos\Core\build\bin dist: [sync] Copying 1 file to C:\Users\Familia\servicos\Core\build\dist [sync] Removed 1 dangling directory from C:\Users\Familia\servicos\Core\build\dist [sync] Removed 8 dangling files from C:\Users\Familia\servicos\Core\build\dist compile: [javac] Compiling 1675 source files to C:\Users\Familia\servicos\Core\build\bin [javac] C:\Users\Familia\servicos\Core\java\com\bit\gameserver\model\actor\L2Npc.java:1358: error: cannot find symbol [javac] if(PhoenixInterface.talkNpc(player.getObjectId(),getObjectId())) [javac] ^ [javac] symbol: variable PhoenixInterface [javac] location: class L2Npc [javac] C:\Users\Familia\servicos\Core\java\com\bit\gameserver\model\actor\L2Npc.java:1361: error: cannot find symbol [javac] if (npcId == PhoenixInterface.getInt("managerNpcId", 0)) [javac] ^ [javac] symbol: variable PhoenixInterface [javac] location: class L2Npc [javac] C:\Users\Familia\servicos\Core\java\com\bit\gameserver\model\actor\L2Npc.java:1363: error: cannot find symbol [javac] PhoenixInterface.showFirstHtml(player.getObjectId(), getObjectId()); [javac] ^ [javac] symbol: variable PhoenixInterface [javac] location: class L2Npc [javac] C:\Users\Familia\servicos\Core\java\com\bit\gameserver\model\actor\L2Npc.java:1367: error: cannot find symbol [javac] if (PhoenixInterface.isParticipating(player.getObjectId())) [javac] ^ [javac] symbol: variable PhoenixInterface [javac] location: class L2Npc [javac] C:\Users\Familia\servicos\Core\java\com\bit\gameserver\model\actor\L2Npc.java:1368: error: cannot find symbol [javac] if (PhoenixInterface.onTalkNpc(getObjectId(), player.getObjectId())) [javac] ^ [javac] symbol: variable PhoenixInterface [javac] location: class L2Npc [javac] 5 errors BUILD FAILED C:\Users\Familia\servicos\Core\build.xml:64: Compile failed; see the compiler error output for details. Total time: 52 seconds4- When i see the file build.xml on line 64 I see this:
<javac srcdir="${src}" classpathref="classpath" destdir="${build.bin}" compiler="javac1.7" debug="true" debuglevel="lines,vars,source" includeantruntime="false" source="1.7" target="1.7" encoding="iso-8859-1"/>So, PLEASE HELP ME to solve this problem!
Thanks too much
3 answers to this question
Recommended Posts