Skip to content

Instantly share code, notes, and snippets.

@LucusAngel

LucusAngel/soc_actions.diff

Last active December 15, 2023 06:54
Show Gist options
  • Save LucusAngel/9c5186cdfa407eb5416c to your computer and use it in GitHub Desktop.
Save LucusAngel/9c5186cdfa407eb5416c to your computer and use it in GitHub Desktop.
Download ZIP
Social Actions
Raw
soc_actions.diff
### Eclipse Workspace Patch 1.0
#P L2J_DataPack
Index: dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java
===================================================================
--- dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java (working copy)
@@ -19,12 +19,12 @@
package quests.Q00413_PathOfTheShillienOracle;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -248,7 +248,7 @@
addExpAndSp(player, 591724, 39928);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = "30330-10.html";
}
Index: dist/game/data/scripts/quests/Q00064_CertifiedBerserker/Q00064_CertifiedBerserker.java
===================================================================
--- dist/game/data/scripts/quests/Q00064_CertifiedBerserker/Q00064_CertifiedBerserker.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00064_CertifiedBerserker/Q00064_CertifiedBerserker.java (working copy)
@@ -20,6 +20,7 @@
import com.l2jserver.gameserver.enums.QuestSound;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
@@ -28,7 +29,6 @@
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -123,7 +123,7 @@
giveItems(player, ORKURUS_RECOMMENDATION, 1);
addExpAndSp(player, 349006, 23948);
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
htmltext = event;
}
break;
Index: dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java
===================================================================
--- dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java (working copy)
@@ -19,12 +19,12 @@
package quests.Q00407_PathOfTheElvenScout;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -256,7 +256,7 @@
}
giveAdena(player, 163800, true);
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = "30328-07.html";
}
Index: dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java
===================================================================
--- dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java (working copy)
@@ -19,12 +19,12 @@
package quests.Q00411_PathOfTheAssassin;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -227,7 +227,7 @@
addExpAndSp(player, 591724, 42528);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = "30416-06.html";
}
Index: dist/game/data/scripts/quests/Q00063_PathOfTheWarder/Q00063_PathOfTheWarder.java
===================================================================
--- dist/game/data/scripts/quests/Q00063_PathOfTheWarder/Q00063_PathOfTheWarder.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00063_PathOfTheWarder/Q00063_PathOfTheWarder.java (working copy)
@@ -19,12 +19,12 @@
package quests.Q00063_PathOfTheWarder;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -466,7 +466,7 @@
addExpAndSp(player, 591724, 35442);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = "32198-19.html";
}
Index: dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java
===================================================================
--- dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java (working copy)
@@ -19,6 +19,7 @@
package quests.Q00415_PathOfTheOrcMonk;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
@@ -26,7 +27,6 @@
import com.l2jserver.gameserver.model.items.type.WeaponType;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -192,7 +192,7 @@
addExpAndSp(player, 295862, 19344);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = event;
}
@@ -563,7 +563,7 @@
addExpAndSp(player, 591724, 38688);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = "30501-04.html";
}
Index: dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java
===================================================================
--- dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00214_TrialOfTheScholar/Q00214_TrialOfTheScholar.java (working copy)
@@ -19,12 +19,12 @@
package quests.Q00214_TrialOfTheScholar;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -642,7 +642,7 @@
giveItems(player, MARK_OF_SCHOLAR, 1);
addExpAndSp(player, 1753926, 113754);
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
htmltext = "30461-14.html";
}
}
Index: dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java
===================================================================
--- dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java (working copy)
@@ -19,12 +19,12 @@
package quests.Q00410_PathOfThePalusKnight;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -262,7 +262,7 @@
addExpAndSp(player, 591724, 39608);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = "30329-11.html";
}
Index: dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
===================================================================
--- dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java (working copy)
@@ -21,11 +21,11 @@
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.enums.QuestSound;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -615,7 +615,7 @@
giveItems(player, MARK_OF_FATE, 1);
addExpAndSp(player, 1365470, 91124);
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
htmltext = "30358-04.html";
}
}
Index: dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java
===================================================================
--- dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java (working copy)
@@ -19,6 +19,7 @@
package quests.Q00414_PathOfTheOrcRaider;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
@@ -310,7 +311,7 @@
addExpAndSp(player, 591724, 34708);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = "30501-03.html";
}
Index: dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java
===================================================================
--- dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00235_MimirsElixir/Q00235_MimirsElixir.java (working copy)
@@ -22,13 +22,13 @@
import java.util.Map;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.QuestItemHolder;
import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
/**
* Mimir's Elixir (235)
@@ -143,7 +143,7 @@
takeItems(player, STAR_OF_DESTINY, -1);
rewardItems(player, ENCHANT_WEAPON_A, 1);
st.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
htmltext = event;
}
break;
Index: dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java
===================================================================
--- dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java (working copy)
@@ -20,6 +20,7 @@
import quests.Q00246_PossessorOfAPreciousSoul3.Q00246_PossessorOfAPreciousSoul3;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -27,7 +28,6 @@
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
/**
* Possessor Of A PreciousSoul part 4 (247)<br>
@@ -88,7 +88,7 @@
st.giveItems(NOBLESS_TIARA, 1);
npc.setTarget(player);
npc.doCast(MIMIRS_ELIXIR.getSkill());
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
st.exitQuest(false, true);
}
break;
Index: dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
===================================================================
--- dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java (working copy)
@@ -21,11 +21,11 @@
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.enums.QuestSound;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -476,7 +476,7 @@
giveItems(player, MARK_OF_LIFE, 1);
addExpAndSp(player, 1886832, 125918);
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
htmltext = "30460-07.html";
}
break;
Index: dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java
===================================================================
--- dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java (working copy)
@@ -19,12 +19,12 @@
package quests.Q00412_PathOfTheDarkWizard;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -286,7 +286,7 @@
addExpAndSp(player, 591724, 35328);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = "30421-13.html";
}
Index: dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java
===================================================================
--- dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00213_TrialOfTheSeeker/Q00213_TrialOfTheSeeker.java (working copy)
@@ -19,12 +19,12 @@
package quests.Q00213_TrialOfTheSeeker;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -437,7 +437,7 @@
giveItems(player, MARK_OF_SEEKER, 1);
addExpAndSp(player, 1029478, 66768);
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
htmltext = "30106-08.html";
}
break;
Index: dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
===================================================================
--- dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java (working copy)
@@ -25,13 +25,13 @@
import com.l2jserver.gameserver.enums.QuestSound;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.ItemHolder;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -233,7 +233,7 @@
}
st.giveItems(SILVERSMITH_HAMMER, 1);
st.exitQuest(false, true);
- talker.sendPacket(new SocialAction(talker.getObjectId(), 3));
+ talker.broadcastSocialAction(SocialActionId.VICTORY);
htmltext = "30523-09.html";
}
break;
Index: dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java
===================================================================
--- dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java (working copy)
@@ -22,6 +22,7 @@
import java.util.Map;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
@@ -32,7 +33,6 @@
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -309,7 +309,7 @@
addExpAndSp(player, 591724, 33628);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = "30379-09.html";
}
Index: dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
===================================================================
--- dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java (working copy)
@@ -24,12 +24,12 @@
import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -201,7 +201,7 @@
if (st.isCond(4) && st.hasQuestItems(KABOO_CHIEFS_2ST_TORQUE))
{
Q00281_HeadForTheHills.giveNewbieReward(talker);
- talker.sendPacket(new SocialAction(talker.getObjectId(), 3));
+ talker.broadcastSocialAction(SocialActionId.VICTORY);
st.giveAdena(17599, true);
st.addExpAndSp(41478, 3555);
st.exitQuest(false, true);
Index: dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java
===================================================================
--- dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00103_SpiritOfCraftsman/Q00103_SpiritOfCraftsman.java (working copy)
@@ -21,12 +21,12 @@
import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.ItemHolder;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -147,7 +147,7 @@
}
rewardItems(talker, BLOODSABER, 1);
qs.exitQuest(false, true);
- talker.sendPacket(new SocialAction(talker.getObjectId(), 3));
+ talker.broadcastSocialAction(SocialActionId.VICTORY);
htmltext = "30307-07.html";
}
}
Index: dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java
===================================================================
--- dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java (working copy)
@@ -19,12 +19,12 @@
package quests.Q00402_PathOfTheHumanKnight;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -188,7 +188,7 @@
addExpAndSp(player, 295862, 18274);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = event;
}
@@ -233,7 +233,7 @@
addExpAndSp(player, 295862, 18274);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = event;
}
@@ -452,7 +452,7 @@
addExpAndSp(player, 591724, 36542);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = "30417-12.html";
}
Index: dist/game/data/scripts/ai/individual/Baium/Baium.java
===================================================================
--- dist/game/data/scripts/ai/individual/Baium/Baium.java (revision 18149)
+++ dist/game/data/scripts/ai/individual/Baium/Baium.java (working copy)
@@ -43,7 +43,6 @@
import com.l2jserver.gameserver.network.serverpackets.Earthquake;
import com.l2jserver.gameserver.network.serverpackets.ExShowScreenMessage;
import com.l2jserver.gameserver.network.serverpackets.PlaySound;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -221,7 +220,7 @@
{
if (npc != null)
{
- zone.broadcastPacket(new SocialAction(_baium.getObjectId(), 2));
+ npc.broadcastSocialAction(2);
}
break;
}
@@ -239,7 +238,7 @@
{
if (npc != null)
{
- zone.broadcastPacket(new SocialAction(npc.getObjectId(), 3));
+ npc.broadcastSocialAction(3);
startQuestTimer("PLAYER_PORT", 6000, npc, player);
}
break;
@@ -265,7 +264,7 @@
{
if ((player != null) && player.isInsideRadius(npc, 16000, true, false))
{
- zone.broadcastPacket(new SocialAction(npc.getObjectId(), 1));
+ npc.broadcastSocialAction(1);
broadcastNpcSay(npc, Say2.NPC_ALL, player.getName() + ", How dare you wake me! Now you shall die!"); // TODO: replace with NpcStringId when are done core support
npc.setTarget(player);
npc.doCast(BAIUM_PRESENT.getSkill());
Index: dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java
===================================================================
--- dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java (working copy)
@@ -22,6 +22,7 @@
import java.util.Map;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
@@ -31,7 +32,6 @@
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
/**
* Path of the Orc Shaman (416)
@@ -190,7 +190,7 @@
}
giveAdena(player, 163800, true);
st.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
st.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = event;
}
@@ -504,7 +504,7 @@
}
giveAdena(player, 81900, true);
st.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
st.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = "31979-03.html";
}
Index: dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java
===================================================================
--- dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00212_TrialOfDuty/Q00212_TrialOfDuty.java (working copy)
@@ -20,6 +20,7 @@
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
@@ -28,7 +29,6 @@
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.variables.PlayerVariables;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -308,7 +308,7 @@
giveAdena(talker, 138968, true);
giveItems(talker, MARK_OF_DUTY, 1);
qs.exitQuest(false, true);
- talker.sendPacket(new SocialAction(talker.getObjectId(), 3));
+ talker.broadcastSocialAction(SocialActionId.VICTORY);
rewardDimensionalDiamonds(talker);
}
break;
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java (revision 18149)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java (working copy)
@@ -23,6 +23,7 @@
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.enums.Team;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.model.L2Object;
@@ -42,7 +43,6 @@
import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
import com.l2jserver.gameserver.network.serverpackets.PlaySound;
import com.l2jserver.gameserver.network.serverpackets.SSQInfo;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.network.serverpackets.SunRise;
import com.l2jserver.gameserver.network.serverpackets.SunSet;
import com.l2jserver.gameserver.network.serverpackets.UserInfo;
@@ -675,25 +675,25 @@
{
try
{
- if (target instanceof L2Character)
+ if (target.isCharacter())
{
if (target instanceof L2ChestInstance)
{
activeChar.sendPacket(SystemMessageId.NOTHING_HAPPENED);
return false;
}
- if ((target instanceof L2Npc) && ((action < 1) || (action > 3)))
+ if (target.isNpc() && ((action < 1) || (action > 3)))
{
activeChar.sendPacket(SystemMessageId.NOTHING_HAPPENED);
return false;
}
- if ((target instanceof L2PcInstance) && ((action < 2) || ((action > 18) && (action != SocialAction.LEVEL_UP))))
+ if ((target.isPlayer() && ((action < 2) || ((action > 18) && (action != SocialActionId.LEVEL_UP.getId())))))
{
activeChar.sendPacket(SystemMessageId.NOTHING_HAPPENED);
return false;
}
- L2Character character = (L2Character) target;
- character.broadcastPacket(new SocialAction(character.getObjectId(), action));
+ final L2Character character = (L2Character) target;
+ character.broadcastSocialAction(action);
}
else
{
Index: dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java
===================================================================
--- dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00215_TrialOfThePilgrim/Q00215_TrialOfThePilgrim.java (working copy)
@@ -20,11 +20,11 @@
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -279,7 +279,7 @@
giveItems(player, MARK_OF_PILGRIM, 1);
addExpAndSp(player, 1258250, 81606);
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
htmltext = "30648-10.html";
}
}
Index: dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java
===================================================================
--- dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java (working copy)
@@ -19,12 +19,12 @@
package quests.Q00408_PathOfTheElvenWizard;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -348,7 +348,7 @@
addExpAndSp(player, 591724, 35928);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = "30414-20.html";
}
Index: dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
===================================================================
--- dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java (working copy)
@@ -20,15 +20,15 @@
import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
+import com.l2jserver.gameserver.enums.QuestSound;
import com.l2jserver.gameserver.enums.Race;
-import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.ItemHolder;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -212,7 +212,7 @@
}
giveItems(talker, BUTCHER, 1);
qs.exitQuest(false, true);
- talker.sendPacket(new SocialAction(talker.getObjectId(), 3));
+ talker.broadcastSocialAction(SocialActionId.VICTORY);
htmltext = "30568-11.html";
}
break;
Index: dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java
===================================================================
--- dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java (working copy)
@@ -19,12 +19,12 @@
package quests.Q00405_PathOfTheCleric;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -180,7 +180,7 @@
addExpAndSp(player, 591724, 35328);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = "30022-09.html";
}
Index: dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
===================================================================
--- dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java (working copy)
@@ -21,11 +21,11 @@
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.enums.QuestSound;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -543,7 +543,7 @@
giveItems(player, MARK_OF_TRUST, 1);
addExpAndSp(player, 1390298, 92782);
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
htmltext = "30031-01.html";
}
}
Index: dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java
===================================================================
--- dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00409_PathOfTheElvenOracle/Q00409_PathOfTheElvenOracle.java (working copy)
@@ -18,6 +18,7 @@
*/
package quests.Q00409_PathOfTheElvenOracle;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
@@ -26,7 +27,6 @@
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -308,7 +308,7 @@
addExpAndSp(player, 591724, 33788);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = "30293-08.html";
}
Index: dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java
===================================================================
--- dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00175_TheWayOfTheWarrior/Q00175_TheWayOfTheWarrior.java (working copy)
@@ -19,6 +19,7 @@
package quests.Q00175_TheWayOfTheWarrior;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.ItemHolder;
@@ -28,7 +29,6 @@
import com.l2jserver.gameserver.model.variables.PlayerVariables;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.serverpackets.ExShowScreenMessage;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
/**
* The Way of the Warrior (175)
@@ -130,7 +130,7 @@
giveItems(player, WARRIORS_SWORD, 1);
addExpAndSp(player, 20739, 1777);
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
htmltext = event;
}
break;
Index: dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java
===================================================================
--- dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java (working copy)
@@ -19,13 +19,13 @@
package quests.Q00401_PathOfTheWarrior;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -292,7 +292,7 @@
addExpAndSp(player, 160267, 34408);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = "30010-13.html";
}
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
===================================================================
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java (revision 18149)
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java (working copy)
@@ -25,6 +25,7 @@
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.AdminTable;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.entity.Hero;
@@ -130,7 +131,16 @@
}
final L2PcInstance target = activeChar.getTarget().isPlayer() ? activeChar.getTarget().getActingPlayer() : activeChar;
- target.setHero(!target.isHero());
+
+ if (target.isHero())
+ {
+ target.setHero(false);
+ }
+ else
+ {
+ target.setHero(true);
+ target.broadcastSocialAction(SocialActionId.HERO_GAIN);
+ }
target.broadcastUserInfo();
}
else if (command.startsWith("admin_givehero"))
Index: dist/game/data/scripts/quests/Q00062_PathOfTheTrooper/Q00062_PathOfTheTrooper.java
===================================================================
--- dist/game/data/scripts/quests/Q00062_PathOfTheTrooper/Q00062_PathOfTheTrooper.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00062_PathOfTheTrooper/Q00062_PathOfTheTrooper.java (working copy)
@@ -20,12 +20,12 @@
import com.l2jserver.gameserver.enums.QuestSound;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -232,7 +232,7 @@
addExpAndSp(player, 591724, 34244);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = "32197-10.html";
}
Index: dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java
===================================================================
--- dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java (working copy)
@@ -19,12 +19,12 @@
package quests.Q00404_PathOfTheHumanWizard;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -225,7 +225,7 @@
addExpAndSp(player, 591724, 36548);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = "30391-06.html";
}
Index: dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java
===================================================================
--- dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00417_PathOfTheScavenger/Q00417_PathOfTheScavenger.java (working copy)
@@ -18,6 +18,7 @@
*/
package quests.Q00417_PathOfTheScavenger;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -25,7 +26,6 @@
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -324,7 +324,7 @@
addExpAndSp(player, 591724, 48808);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = event;
}
@@ -672,7 +672,7 @@
addExpAndSp(player, 295862, 24404);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = "30316-05.html";
}
Index: dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java
===================================================================
--- dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java (working copy)
@@ -19,12 +19,12 @@
package quests.Q00418_PathOfTheArtisan;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -219,7 +219,7 @@
addExpAndSp(player, 591724, 36848);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = event;
}
@@ -245,7 +245,7 @@
addExpAndSp(player, 295862, 18424);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = event;
}
@@ -271,7 +271,7 @@
addExpAndSp(player, 295862, 18424);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = event;
}
@@ -297,7 +297,7 @@
addExpAndSp(player, 295862, 18424);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = event;
}
@@ -371,7 +371,7 @@
addExpAndSp(player, 295862, 18424);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = event;
}
@@ -407,7 +407,7 @@
addExpAndSp(player, 295862, 18424);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = event;
}
Index: dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java
===================================================================
--- dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java (working copy)
@@ -22,13 +22,13 @@
import java.util.Map;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
import com.l2jserver.gameserver.model.holders.ItemChanceHolder;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -229,7 +229,7 @@
addExpAndSp(player, 591724, 33328);
}
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
qs.saveGlobalQuestVar("1ClassQuestFinished", "1");
htmltext = "30327-10.html";
}
Index: dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
===================================================================
--- dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java (working copy)
@@ -21,11 +21,11 @@
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.enums.QuestSound;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -507,7 +507,7 @@
giveItems(player, MARK_OF_PROSPERITY, 1);
addExpAndSp(player, 1199958, 80080);
qs.exitQuest(false, true);
- player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ player.broadcastSocialAction(SocialActionId.VICTORY);
htmltext = "30104-13.html";
}
}
Index: dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
===================================================================
--- dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java (working copy)
@@ -22,12 +22,12 @@
import com.l2jserver.gameserver.enums.QuestSound;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -149,7 +149,7 @@
else if (st.isCond(4) && st.hasQuestItems(KARTAS_TRANSLATION))
{
Q00281_HeadForTheHills.giveNewbieReward(talker);
- talker.sendPacket(new SocialAction(talker.getObjectId(), 3));
+ talker.broadcastSocialAction(SocialActionId.VICTORY);
st.giveAdena(10266, true);
st.addExpAndSp(24195, 2074);
st.exitQuest(false, true);
Index: dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
===================================================================
--- dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java (revision 18149)
+++ dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java (working copy)
@@ -21,6 +21,7 @@
import com.l2jserver.gameserver.datatables.SpawnTable;
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.ItemHolder;
@@ -28,7 +29,6 @@
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.variables.PlayerVariables;
import com.l2jserver.gameserver.network.serverpackets.RadarControl;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
/**
@@ -345,7 +345,7 @@
vars.set("2ND_CLASS_DIAMOND_REWARD", true);
}
- talker.sendPacket(new SocialAction(talker.getObjectId(), 3));
+ talker.broadcastSocialAction(SocialActionId.VICTORY);
qs.exitQuest(false, true);
htmltext = "30646-07.html";
break;
#P L2J_Server
Index: java/com/l2jserver/gameserver/model/actor/stat/PetStat.java
===================================================================
--- java/com/l2jserver/gameserver/model/actor/stat/PetStat.java (revision 10075)
+++ java/com/l2jserver/gameserver/model/actor/stat/PetStat.java (working copy)
@@ -20,12 +20,12 @@
import com.l2jserver.gameserver.datatables.ExperienceTable;
import com.l2jserver.gameserver.datatables.PetDataTable;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.model.stats.Stats;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
@@ -84,7 +84,7 @@
getActiveChar().broadcastPacket(su);
if (levelIncreased)
{
- getActiveChar().broadcastPacket(new SocialAction(getActiveChar().getObjectId(), SocialAction.LEVEL_UP));
+ getActiveChar().broadcastSocialAction(SocialActionId.LEVEL_UP);
}
// Send a Server->Client packet PetInfo to the L2PcInstance
getActiveChar().updateAndBroadcastStatus(1);
Index: java/com/l2jserver/gameserver/model/entity/Hero.java
===================================================================
--- java/com/l2jserver/gameserver/model/entity/Hero.java (revision 10075)
+++ java/com/l2jserver/gameserver/model/entity/Hero.java (working copy)
@@ -43,6 +43,7 @@
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.datatables.ClassListData;
import com.l2jserver.gameserver.datatables.NpcData;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.instancemanager.CastleManager;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.L2World;
@@ -56,7 +57,6 @@
import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.network.serverpackets.UserInfo;
import com.l2jserver.util.StringUtil;
@@ -973,7 +973,7 @@
}
player.setHero(true);
- player.broadcastPacket(new SocialAction(player.getObjectId(), 20016)); // Hero Animation
+ player.broadcastSocialAction(SocialActionId.HERO_GAIN);
player.sendPacket(new UserInfo(player));
player.sendPacket(new ExBrExtraUserInfo(player));
player.broadcastUserInfo();
Index: java/com/l2jserver/gameserver/network/serverpackets/SocialAction.java
===================================================================
--- java/com/l2jserver/gameserver/network/serverpackets/SocialAction.java (revision 10075)
+++ java/com/l2jserver/gameserver/network/serverpackets/SocialAction.java (working copy)
@@ -18,23 +18,33 @@
*/
package com.l2jserver.gameserver.network.serverpackets;
+import com.l2jserver.gameserver.enums.SocialActionId;
+
public class SocialAction extends L2GameServerPacket
{
- public static final int LEVEL_UP = 2122;
-
private final int _charObjId;
private final int _actionId;
/**
* @param objectId
- * @param actionId
+ * @param socialAction
*/
- public SocialAction(int objectId, int actionId)
+ public SocialAction(int objectId, SocialActionId socialAction)
{
_charObjId = objectId;
- _actionId = actionId;
+ _actionId = socialAction.getId();
}
+ /**
+ * @param objectId
+ * @param socialActionId
+ */
+ public SocialAction(int objectId, int socialActionId)
+ {
+ _charObjId = objectId;
+ _actionId = socialActionId;
+ }
+
@Override
protected final void writeImpl()
{
Index: java/com/l2jserver/gameserver/model/actor/tasks/npc/trap/TrapTask.java
===================================================================
--- java/com/l2jserver/gameserver/model/actor/tasks/npc/trap/TrapTask.java (revision 10075)
+++ java/com/l2jserver/gameserver/model/actor/tasks/npc/trap/TrapTask.java (working copy)
@@ -22,7 +22,6 @@
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2TrapInstance;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
/**
* Trap task.
@@ -51,7 +50,7 @@
_trap.setRemainingTime(_trap.getRemainingTime() - TICK);
if (_trap.getRemainingTime() < (_trap.getLifeTime() - 15000))
{
- _trap.broadcastPacket(new SocialAction(_trap.getObjectId(), 2));
+ _trap.broadcastSocialAction(2);
}
if (_trap.getRemainingTime() <= 0)
{
Index: java/com/l2jserver/gameserver/network/clientpackets/AnswerCoupleAction.java
===================================================================
--- java/com/l2jserver/gameserver/network/clientpackets/AnswerCoupleAction.java (revision 10075)
+++ java/com/l2jserver/gameserver/network/clientpackets/AnswerCoupleAction.java (working copy)
@@ -22,7 +22,6 @@
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ExRotation;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Util;
@@ -77,8 +76,8 @@
heading = Util.calculateHeadingFrom(target, activeChar);
target.setHeading(heading);
target.broadcastPacket(new ExRotation(target.getObjectId(), heading));
- activeChar.broadcastPacket(new SocialAction(activeChar.getObjectId(), _actionId));
- target.broadcastPacket(new SocialAction(_charObjId, _actionId));
+ activeChar.broadcastSocialAction(_actionId);
+ target.broadcastSocialAction(_actionId);
}
else if (_answer == -1) // refused
{
Index: java/com/l2jserver/gameserver/model/actor/stat/PcStat.java
===================================================================
--- java/com/l2jserver/gameserver/model/actor/stat/PcStat.java (revision 10075)
+++ java/com/l2jserver/gameserver/model/actor/stat/PcStat.java (working copy)
@@ -23,6 +23,7 @@
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.ExperienceTable;
import com.l2jserver.gameserver.datatables.PetDataTable;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.model.L2PetLevelData;
import com.l2jserver.gameserver.model.PcCondOverride;
import com.l2jserver.gameserver.model.actor.instance.L2ClassMasterInstance;
@@ -42,7 +43,6 @@
import com.l2jserver.gameserver.network.serverpackets.ExVitalityPointInfo;
import com.l2jserver.gameserver.network.serverpackets.ExVoteSystemInfo;
import com.l2jserver.gameserver.network.serverpackets.PledgeShowMemberListUpdate;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.network.serverpackets.UserInfo;
@@ -266,7 +266,7 @@
}
getActiveChar().setCurrentCp(getMaxCp());
- getActiveChar().broadcastPacket(new SocialAction(getActiveChar().getObjectId(), SocialAction.LEVEL_UP));
+ getActiveChar().broadcastSocialAction(SocialActionId.LEVEL_UP);
getActiveChar().sendPacket(SystemMessageId.YOU_INCREASED_YOUR_LEVEL);
L2ClassMasterInstance.showQuestionMark(getActiveChar());
@@ -300,7 +300,7 @@
pet.getStat().getExpForLevel(getActiveChar().getLevel());
pet.setCurrentHp(pet.getMaxHp());
pet.setCurrentMp(pet.getMaxMp());
- pet.broadcastPacket(new SocialAction(getActiveChar().getObjectId(), SocialAction.LEVEL_UP));
+ pet.broadcastSocialAction(SocialActionId.LEVEL_UP);
pet.updateAndBroadcastStatus(1);
}
}
Index: java/com/l2jserver/gameserver/model/actor/instance/L2TamedBeastInstance.java
===================================================================
--- java/com/l2jserver/gameserver/model/actor/instance/L2TamedBeastInstance.java (revision 10075)
+++ java/com/l2jserver/gameserver/model/actor/instance/L2TamedBeastInstance.java (working copy)
@@ -38,7 +38,6 @@
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo;
import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.network.serverpackets.StopMove;
import com.l2jserver.util.Rnd;
@@ -433,7 +432,7 @@
if ((item != null) && (item.getCount() >= 1))
{
owner.destroyItem("BeastMob", item, 1, _tamedBeast, true);
- _tamedBeast.broadcastPacket(new SocialAction(_tamedBeast.getObjectId(), 3));
+ _tamedBeast.broadcastSocialAction(3);
}
else
{
Index: java/com/l2jserver/gameserver/model/CursedWeapon.java
===================================================================
--- java/com/l2jserver/gameserver/model/CursedWeapon.java (revision 10075)
+++ java/com/l2jserver/gameserver/model/CursedWeapon.java (working copy)
@@ -45,7 +45,6 @@
import com.l2jserver.gameserver.network.serverpackets.ExRedSky;
import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
import com.l2jserver.gameserver.network.serverpackets.ItemList;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.network.serverpackets.UserInfo;
import com.l2jserver.gameserver.util.Broadcast;
@@ -469,10 +468,8 @@
// Refresh player stats
_player.broadcastUserInfo();
- SocialAction atk = new SocialAction(_player.getObjectId(), 17);
+ _player.broadcastSocialAction(17);
- _player.broadcastPacket(atk);
-
sm = SystemMessage.getSystemMessage(SystemMessageId.THE_OWNER_OF_S2_HAS_APPEARED_IN_THE_S1_REGION);
sm.addZoneName(_player.getX(), _player.getY(), _player.getZ()); // Region Name
sm.addItemName(_item);
Index: java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
===================================================================
--- java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java (revision 10075)
+++ java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java (working copy)
@@ -94,6 +94,7 @@
import com.l2jserver.gameserver.enums.Sex;
import com.l2jserver.gameserver.enums.ShortcutType;
import com.l2jserver.gameserver.enums.ShotType;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.enums.Team;
import com.l2jserver.gameserver.handler.IItemHandler;
import com.l2jserver.gameserver.handler.ItemHandler;
@@ -309,7 +310,6 @@
import com.l2jserver.gameserver.network.serverpackets.SkillCoolTime;
import com.l2jserver.gameserver.network.serverpackets.SkillList;
import com.l2jserver.gameserver.network.serverpackets.Snoop;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
import com.l2jserver.gameserver.network.serverpackets.StopMove;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
@@ -10382,7 +10382,7 @@
_shortCuts.restoreMe();
sendPacket(new ShortCutInit(this));
- broadcastPacket(new SocialAction(getObjectId(), SocialAction.LEVEL_UP));
+ broadcastSocialAction(SocialActionId.LEVEL_UP);
sendPacket(new SkillCoolTime(this));
sendPacket(new ExStorageMaxCount(this));
Index: java/com/l2jserver/gameserver/enums/SocialActionId.java
===================================================================
--- java/com/l2jserver/gameserver/enums/SocialActionId.java (revision 0)
+++ java/com/l2jserver/gameserver/enums/SocialActionId.java (working copy)
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2004-2014 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * @author FallenAngel
+ */
+public enum SocialActionId
+{
+ // Social
+ GREETING(2),
+ VICTORY(3),
+ ADVANCE(4),
+ NO(5),
+ YES(6),
+ BOW(7),
+ UNWARE(8),
+ SOCIAL_WAITING(9),
+ LAUGH(10),
+ APPLAUD(11),
+ DANCE(12),
+ SORROW(13),
+ CHARM(14),
+ SHYNESS(15),
+ // Couple social
+ EXCHANGE_BOWS(16),
+ HIGH_FIVE(17),
+ COUPLE_DANCE(18),
+ // Special
+ LEVEL_UP(2122),
+ HERO_GAIN(20016);
+
+ private int _actionId;
+
+ private SocialActionId(int actionId)
+ {
+ _actionId = actionId;
+ }
+
+ public int getId()
+ {
+ return _actionId;
+ }
+}
\ No newline at end of file
Index: java/com/l2jserver/gameserver/model/actor/instance/L2GuardInstance.java
===================================================================
--- java/com/l2jserver/gameserver/model/actor/instance/L2GuardInstance.java (revision 10075)
+++ java/com/l2jserver/gameserver/model/actor/instance/L2GuardInstance.java (working copy)
@@ -33,7 +33,6 @@
import com.l2jserver.gameserver.model.events.EventType;
import com.l2jserver.gameserver.model.events.impl.character.npc.OnNpcFirstTalk;
import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.util.Rnd;
/**
@@ -182,7 +181,7 @@
{
// Send a Server->Client packet SocialAction to the all L2PcInstance on the _knownPlayer of the L2NpcInstance
// to display a social action of the L2GuardInstance on their client
- broadcastPacket(new SocialAction(getObjectId(), Rnd.nextInt(8)));
+ broadcastSocialAction(Rnd.nextInt(8));
player.setLastFolkNPC(this);
Index: java/com/l2jserver/gameserver/model/actor/L2Npc.java
===================================================================
--- java/com/l2jserver/gameserver/model/actor/L2Npc.java (revision 10075)
+++ java/com/l2jserver/gameserver/model/actor/L2Npc.java (working copy)
@@ -94,7 +94,6 @@
import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jserver.gameserver.network.serverpackets.ServerObjectInfo;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.taskmanager.DecayTaskManager;
import com.l2jserver.gameserver.util.Broadcast;
import com.l2jserver.util.Rnd;
@@ -371,7 +370,7 @@
if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL)
{
_lastSocialBroadcast = now;
- broadcastPacket(new SocialAction(getObjectId(), animationId));
+ broadcastSocialAction(animationId);
}
}
Index: java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherNpcInstance.java
===================================================================
--- java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherNpcInstance.java (revision 10075)
+++ java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherNpcInstance.java (working copy)
@@ -38,7 +38,6 @@
import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
import com.l2jserver.util.Rnd;
@@ -161,9 +160,7 @@
// L2PcInstance on the _knownPlayer of the L2NpcInstance
// to display a social action of the L2NpcInstance on their
// client
- SocialAction sa = new SocialAction(getObjectId(), Rnd.get(8));
- broadcastPacket(sa);
-
+ broadcastSocialAction(Rnd.get(8));
doAction(player);
}
}
Index: java/com/l2jserver/gameserver/model/actor/L2Character.java
===================================================================
--- java/com/l2jserver/gameserver/model/actor/L2Character.java (revision 10075)
+++ java/com/l2jserver/gameserver/model/actor/L2Character.java (working copy)
@@ -54,6 +54,7 @@
import com.l2jserver.gameserver.enums.InstanceType;
import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.enums.ShotType;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.enums.Team;
import com.l2jserver.gameserver.instancemanager.InstanceManager;
import com.l2jserver.gameserver.instancemanager.MapRegionManager;
@@ -6550,11 +6551,16 @@
return _effectList.isAffected(flag);
}
- public void broadcastSocialAction(int id)
+ public void broadcastSocialAction(int socialActionId)
{
- broadcastPacket(new SocialAction(getObjectId(), id));
+ broadcastPacket(new SocialAction(getObjectId(), socialActionId));
}
+ public void broadcastSocialAction(SocialActionId socialAction)
+ {
+ broadcastPacket(new SocialAction(getObjectId(), socialAction));
+ }
+
public Team getTeam()
{
return _team;
Index: java/com/l2jserver/gameserver/network/clientpackets/RequestActionUse.java
===================================================================
--- java/com/l2jserver/gameserver/network/clientpackets/RequestActionUse.java (revision 10075)
+++ java/com/l2jserver/gameserver/network/clientpackets/RequestActionUse.java (working copy)
@@ -31,6 +31,7 @@
import com.l2jserver.gameserver.datatables.SummonSkillsTable;
import com.l2jserver.gameserver.enums.MountType;
import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.enums.SocialActionId;
import com.l2jserver.gameserver.instancemanager.AirShipManager;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Summon;
@@ -51,7 +52,6 @@
import com.l2jserver.gameserver.network.serverpackets.ExBasicActionList;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
import com.l2jserver.gameserver.network.serverpackets.RecipeShopManageList;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager;
import com.l2jserver.util.Rnd;
@@ -730,46 +730,46 @@
break;
// Social Packets
case 12: // Greeting
- tryBroadcastSocial(2);
+ tryBroadcastSocial(SocialActionId.GREETING);
break;
case 13: // Victory
- tryBroadcastSocial(3);
+ tryBroadcastSocial(SocialActionId.VICTORY);
break;
case 14: // Advance
- tryBroadcastSocial(4);
+ tryBroadcastSocial(SocialActionId.ADVANCE);
break;
case 24: // Yes
- tryBroadcastSocial(6);
+ tryBroadcastSocial(SocialActionId.YES);
break;
case 25: // No
- tryBroadcastSocial(5);
+ tryBroadcastSocial(SocialActionId.NO);
break;
case 26: // Bow
- tryBroadcastSocial(7);
+ tryBroadcastSocial(SocialActionId.BOW);
break;
case 29: // Unaware
- tryBroadcastSocial(8);
+ tryBroadcastSocial(SocialActionId.UNWARE);
break;
case 30: // Social Waiting
- tryBroadcastSocial(9);
+ tryBroadcastSocial(SocialActionId.SOCIAL_WAITING);
break;
case 31: // Laugh
- tryBroadcastSocial(10);
+ tryBroadcastSocial(SocialActionId.LAUGH);
break;
case 33: // Applaud
- tryBroadcastSocial(11);
+ tryBroadcastSocial(SocialActionId.APPLAUD);
break;
case 34: // Dance
- tryBroadcastSocial(12);
+ tryBroadcastSocial(SocialActionId.DANCE);
break;
case 35: // Sorrow
- tryBroadcastSocial(13);
+ tryBroadcastSocial(SocialActionId.SORROW);
break;
case 62: // Charm
- tryBroadcastSocial(14);
+ tryBroadcastSocial(SocialActionId.CHARM);
break;
case 66: // Shyness
- tryBroadcastSocial(15);
+ tryBroadcastSocial(SocialActionId.SHYNESS);
break;
default:
_log.warning(activeChar.getName() + ": unhandled action type " + _actionId);
@@ -924,9 +924,9 @@
/**
* Try to broadcast SocialAction packet.
- * @param id the social action Id to broadcast
+ * @param socialActionId the social action to broadcast
*/
- private void tryBroadcastSocial(int id)
+ private void tryBroadcastSocial(SocialActionId socialActionId)
{
final L2PcInstance activeChar = getActiveChar();
if (activeChar == null)
@@ -941,7 +941,7 @@
if (activeChar.canMakeSocialAction())
{
- activeChar.broadcastPacket(new SocialAction(activeChar.getObjectId(), id));
+ activeChar.broadcastSocialAction(socialActionId);
}
}
Index: java/com/l2jserver/gameserver/model/entity/Duel.java
===================================================================
--- java/com/l2jserver/gameserver/model/entity/Duel.java (revision 10075)
+++ java/com/l2jserver/gameserver/model/entity/Duel.java (working copy)
@@ -42,7 +42,6 @@
import com.l2jserver.gameserver.network.serverpackets.ExDuelUpdateUserInfo;
import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
import com.l2jserver.gameserver.network.serverpackets.PlaySound;
-import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
public class Duel
@@ -686,12 +685,12 @@
{
for (L2PcInstance temp : looser.getParty().getMembers())
{
- temp.broadcastPacket(new SocialAction(temp.getObjectId(), 7));
+ temp.broadcastSocialAction(7);
}
}
else
{
- looser.broadcastPacket(new SocialAction(looser.getObjectId(), 7));
+ looser.broadcastSocialAction(7);
}
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment