From abaa1e83b10dff1f28f2b25537facc57a4f7147b Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 24 Apr 2020 19:16:44 +0000 Subject: [PATCH] Small revert related with ownsAtLeastOneItem method addition. --- .../game/data/scripts/events/BirthOfDraco/BirthOfDraco.java | 2 +- .../scripts/events/CharacterBirthday/CharacterBirthday.java | 2 +- .../game/data/scripts/events/BirthOfDraco/BirthOfDraco.java | 2 +- .../scripts/events/CharacterBirthday/CharacterBirthday.java | 2 +- .../game/data/scripts/events/BirthOfDraco/BirthOfDraco.java | 2 +- .../scripts/events/CharacterBirthday/CharacterBirthday.java | 2 +- .../game/data/scripts/events/BirthOfDraco/BirthOfDraco.java | 2 +- .../scripts/events/CharacterBirthday/CharacterBirthday.java | 2 +- .../game/data/scripts/events/BirthOfDraco/BirthOfDraco.java | 2 +- .../scripts/events/CharacterBirthday/CharacterBirthday.java | 2 +- .../game/data/scripts/events/BirthOfDraco/BirthOfDraco.java | 2 +- .../scripts/events/CharacterBirthday/CharacterBirthday.java | 2 +- .../game/data/scripts/events/BirthOfDraco/BirthOfDraco.java | 2 +- .../scripts/events/CharacterBirthday/CharacterBirthday.java | 2 +- .../game/data/scripts/events/BirthOfDraco/BirthOfDraco.java | 2 +- .../scripts/events/CharacterBirthday/CharacterBirthday.java | 2 +- .../scripts/events/CharacterBirthday/CharacterBirthday.java | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java index f33d775d9a..a168b44adb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java @@ -104,7 +104,7 @@ public class BirthOfDraco extends LongTimeEvent break; } /* - * case "giveAgathion": { if (hasQuestItemss(player, AGATHION)) { htmltext = "33687-03.htm"; } else { giveItems(player, AGATHION, 1); htmltext = "33687-02.htm"; } break; } + * case "giveAgathion": { if (hasQuestItems(player, AGATHION)) { htmltext = "33687-03.htm"; } else { giveItems(player, AGATHION, 1); htmltext = "33687-02.htm"; } break; } */ } return htmltext; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java index 80bce95f09..693be76139 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java @@ -77,7 +77,7 @@ public class CharacterBirthday extends AbstractNpcAI else if (event.equalsIgnoreCase("change")) { // Change Hat - if (ownsAtLeastOneItem(player, 10250)) + if (hasQuestItems(player, 10250)) { takeItems(player, 10250, 1); // Adventurer Hat (Event) giveItems(player, 21594, 1); // Birthday Hat diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java index f33d775d9a..a168b44adb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java @@ -104,7 +104,7 @@ public class BirthOfDraco extends LongTimeEvent break; } /* - * case "giveAgathion": { if (hasQuestItemss(player, AGATHION)) { htmltext = "33687-03.htm"; } else { giveItems(player, AGATHION, 1); htmltext = "33687-02.htm"; } break; } + * case "giveAgathion": { if (hasQuestItems(player, AGATHION)) { htmltext = "33687-03.htm"; } else { giveItems(player, AGATHION, 1); htmltext = "33687-02.htm"; } break; } */ } return htmltext; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java index 80bce95f09..693be76139 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java @@ -77,7 +77,7 @@ public class CharacterBirthday extends AbstractNpcAI else if (event.equalsIgnoreCase("change")) { // Change Hat - if (ownsAtLeastOneItem(player, 10250)) + if (hasQuestItems(player, 10250)) { takeItems(player, 10250, 1); // Adventurer Hat (Event) giveItems(player, 21594, 1); // Birthday Hat diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java index f33d775d9a..a168b44adb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java @@ -104,7 +104,7 @@ public class BirthOfDraco extends LongTimeEvent break; } /* - * case "giveAgathion": { if (hasQuestItemss(player, AGATHION)) { htmltext = "33687-03.htm"; } else { giveItems(player, AGATHION, 1); htmltext = "33687-02.htm"; } break; } + * case "giveAgathion": { if (hasQuestItems(player, AGATHION)) { htmltext = "33687-03.htm"; } else { giveItems(player, AGATHION, 1); htmltext = "33687-02.htm"; } break; } */ } return htmltext; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java index 80bce95f09..693be76139 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java @@ -77,7 +77,7 @@ public class CharacterBirthday extends AbstractNpcAI else if (event.equalsIgnoreCase("change")) { // Change Hat - if (ownsAtLeastOneItem(player, 10250)) + if (hasQuestItems(player, 10250)) { takeItems(player, 10250, 1); // Adventurer Hat (Event) giveItems(player, 21594, 1); // Birthday Hat diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java index f33d775d9a..a168b44adb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java @@ -104,7 +104,7 @@ public class BirthOfDraco extends LongTimeEvent break; } /* - * case "giveAgathion": { if (hasQuestItemss(player, AGATHION)) { htmltext = "33687-03.htm"; } else { giveItems(player, AGATHION, 1); htmltext = "33687-02.htm"; } break; } + * case "giveAgathion": { if (hasQuestItems(player, AGATHION)) { htmltext = "33687-03.htm"; } else { giveItems(player, AGATHION, 1); htmltext = "33687-02.htm"; } break; } */ } return htmltext; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java index 80bce95f09..693be76139 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java @@ -77,7 +77,7 @@ public class CharacterBirthday extends AbstractNpcAI else if (event.equalsIgnoreCase("change")) { // Change Hat - if (ownsAtLeastOneItem(player, 10250)) + if (hasQuestItems(player, 10250)) { takeItems(player, 10250, 1); // Adventurer Hat (Event) giveItems(player, 21594, 1); // Birthday Hat diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java index f33d775d9a..a168b44adb 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java @@ -104,7 +104,7 @@ public class BirthOfDraco extends LongTimeEvent break; } /* - * case "giveAgathion": { if (hasQuestItemss(player, AGATHION)) { htmltext = "33687-03.htm"; } else { giveItems(player, AGATHION, 1); htmltext = "33687-02.htm"; } break; } + * case "giveAgathion": { if (hasQuestItems(player, AGATHION)) { htmltext = "33687-03.htm"; } else { giveItems(player, AGATHION, 1); htmltext = "33687-02.htm"; } break; } */ } return htmltext; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java index 80bce95f09..693be76139 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java @@ -77,7 +77,7 @@ public class CharacterBirthday extends AbstractNpcAI else if (event.equalsIgnoreCase("change")) { // Change Hat - if (ownsAtLeastOneItem(player, 10250)) + if (hasQuestItems(player, 10250)) { takeItems(player, 10250, 1); // Adventurer Hat (Event) giveItems(player, 21594, 1); // Birthday Hat diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java index f33d775d9a..a168b44adb 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java @@ -104,7 +104,7 @@ public class BirthOfDraco extends LongTimeEvent break; } /* - * case "giveAgathion": { if (hasQuestItemss(player, AGATHION)) { htmltext = "33687-03.htm"; } else { giveItems(player, AGATHION, 1); htmltext = "33687-02.htm"; } break; } + * case "giveAgathion": { if (hasQuestItems(player, AGATHION)) { htmltext = "33687-03.htm"; } else { giveItems(player, AGATHION, 1); htmltext = "33687-02.htm"; } break; } */ } return htmltext; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java index 80bce95f09..693be76139 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java @@ -77,7 +77,7 @@ public class CharacterBirthday extends AbstractNpcAI else if (event.equalsIgnoreCase("change")) { // Change Hat - if (ownsAtLeastOneItem(player, 10250)) + if (hasQuestItems(player, 10250)) { takeItems(player, 10250, 1); // Adventurer Hat (Event) giveItems(player, 21594, 1); // Birthday Hat diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java index f33d775d9a..a168b44adb 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java @@ -104,7 +104,7 @@ public class BirthOfDraco extends LongTimeEvent break; } /* - * case "giveAgathion": { if (hasQuestItemss(player, AGATHION)) { htmltext = "33687-03.htm"; } else { giveItems(player, AGATHION, 1); htmltext = "33687-02.htm"; } break; } + * case "giveAgathion": { if (hasQuestItems(player, AGATHION)) { htmltext = "33687-03.htm"; } else { giveItems(player, AGATHION, 1); htmltext = "33687-02.htm"; } break; } */ } return htmltext; diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java index 80bce95f09..693be76139 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java @@ -77,7 +77,7 @@ public class CharacterBirthday extends AbstractNpcAI else if (event.equalsIgnoreCase("change")) { // Change Hat - if (ownsAtLeastOneItem(player, 10250)) + if (hasQuestItems(player, 10250)) { takeItems(player, 10250, 1); // Adventurer Hat (Event) giveItems(player, 21594, 1); // Birthday Hat diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java index f33d775d9a..a168b44adb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/BirthOfDraco/BirthOfDraco.java @@ -104,7 +104,7 @@ public class BirthOfDraco extends LongTimeEvent break; } /* - * case "giveAgathion": { if (hasQuestItemss(player, AGATHION)) { htmltext = "33687-03.htm"; } else { giveItems(player, AGATHION, 1); htmltext = "33687-02.htm"; } break; } + * case "giveAgathion": { if (hasQuestItems(player, AGATHION)) { htmltext = "33687-03.htm"; } else { giveItems(player, AGATHION, 1); htmltext = "33687-02.htm"; } break; } */ } return htmltext; diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java index 80bce95f09..693be76139 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java @@ -77,7 +77,7 @@ public class CharacterBirthday extends AbstractNpcAI else if (event.equalsIgnoreCase("change")) { // Change Hat - if (ownsAtLeastOneItem(player, 10250)) + if (hasQuestItems(player, 10250)) { takeItems(player, 10250, 1); // Adventurer Hat (Event) giveItems(player, 21594, 1); // Birthday Hat diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java index 80bce95f09..693be76139 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java @@ -77,7 +77,7 @@ public class CharacterBirthday extends AbstractNpcAI else if (event.equalsIgnoreCase("change")) { // Change Hat - if (ownsAtLeastOneItem(player, 10250)) + if (hasQuestItems(player, 10250)) { takeItems(player, 10250, 1); // Adventurer Hat (Event) giveItems(player, 21594, 1); // Birthday Hat