From 1332da66e0857a2f5c8e3711e1bafad2a360fa27 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 3 Aug 2020 04:54:30 +0000 Subject: [PATCH] Fixed Master of enchanting event. Contributed by CostyKiller. --- .../MasterOfEnchanting/{32599-bidth.htm => 32599-birth.htm} | 0 .../scripts/events/MasterOfEnchanting/MasterOfEnchanting.java | 4 ++-- .../MasterOfEnchanting/{32599-bidth.htm => 32599-birth.htm} | 0 .../scripts/events/MasterOfEnchanting/MasterOfEnchanting.java | 4 ++-- .../MasterOfEnchanting/{32599-bidth.htm => 32599-birth.htm} | 0 .../scripts/events/MasterOfEnchanting/MasterOfEnchanting.java | 4 ++-- .../MasterOfEnchanting/{32599-bidth.htm => 32599-birth.htm} | 0 .../scripts/events/MasterOfEnchanting/MasterOfEnchanting.java | 4 ++-- .../MasterOfEnchanting/{32599-bidth.htm => 32599-birth.htm} | 0 .../scripts/events/MasterOfEnchanting/MasterOfEnchanting.java | 4 ++-- .../MasterOfEnchanting/{32599-bidth.htm => 32599-birth.htm} | 0 .../scripts/events/MasterOfEnchanting/MasterOfEnchanting.java | 4 ++-- .../MasterOfEnchanting/{32599-bidth.htm => 32599-birth.htm} | 0 .../scripts/events/MasterOfEnchanting/MasterOfEnchanting.java | 4 ++-- .../MasterOfEnchanting/{32599-bidth.htm => 32599-birth.htm} | 0 .../scripts/events/MasterOfEnchanting/MasterOfEnchanting.java | 4 ++-- .../MasterOfEnchanting/{32599-bidth.htm => 32599-birth.htm} | 0 .../scripts/events/MasterOfEnchanting/MasterOfEnchanting.java | 4 ++-- .../MasterOfEnchanting/{32599-bidth.htm => 32599-birth.htm} | 0 .../scripts/events/MasterOfEnchanting/MasterOfEnchanting.java | 4 ++-- 20 files changed, 20 insertions(+), 20 deletions(-) rename L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/MasterOfEnchanting/{32599-bidth.htm => 32599-birth.htm} (100%) rename L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/MasterOfEnchanting/{32599-bidth.htm => 32599-birth.htm} (100%) rename L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/MasterOfEnchanting/{32599-bidth.htm => 32599-birth.htm} (100%) rename L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/MasterOfEnchanting/{32599-bidth.htm => 32599-birth.htm} (100%) rename L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/MasterOfEnchanting/{32599-bidth.htm => 32599-birth.htm} (100%) rename L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/MasterOfEnchanting/{32599-bidth.htm => 32599-birth.htm} (100%) rename L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/MasterOfEnchanting/{32599-bidth.htm => 32599-birth.htm} (100%) rename L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/MasterOfEnchanting/{32599-bidth.htm => 32599-birth.htm} (100%) rename L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/MasterOfEnchanting/{32599-bidth.htm => 32599-birth.htm} (100%) rename L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/MasterOfEnchanting/{32599-bidth.htm => 32599-birth.htm} (100%) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/MasterOfEnchanting/32599-bidth.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/MasterOfEnchanting/32599-birth.htm similarity index 100% rename from L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/MasterOfEnchanting/32599-bidth.htm rename to L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/MasterOfEnchanting/32599-birth.htm diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index d86f762d55..0898d8dbc5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -87,11 +87,11 @@ public class MasterOfEnchanting extends LongTimeEvent else if (event.equalsIgnoreCase("buy_scroll_24")) { final long curTime = System.currentTimeMillis(); - final String value = player.getVariables().getString("MasterOfEnchanting"); + final String value = player.getVariables().getString("MasterOfEnchanting", ""); final long reuse = value.equals("") ? 0 : Long.parseLong(value); if (player.getCreateDate().after(getEventPeriod().getStartDate())) { - return "32599-bidth.htm"; + return "32599-birth.htm"; } if (curTime > reuse) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/MasterOfEnchanting/32599-bidth.htm b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/MasterOfEnchanting/32599-birth.htm similarity index 100% rename from L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/MasterOfEnchanting/32599-bidth.htm rename to L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/MasterOfEnchanting/32599-birth.htm diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index d86f762d55..0898d8dbc5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -87,11 +87,11 @@ public class MasterOfEnchanting extends LongTimeEvent else if (event.equalsIgnoreCase("buy_scroll_24")) { final long curTime = System.currentTimeMillis(); - final String value = player.getVariables().getString("MasterOfEnchanting"); + final String value = player.getVariables().getString("MasterOfEnchanting", ""); final long reuse = value.equals("") ? 0 : Long.parseLong(value); if (player.getCreateDate().after(getEventPeriod().getStartDate())) { - return "32599-bidth.htm"; + return "32599-birth.htm"; } if (curTime > reuse) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/MasterOfEnchanting/32599-bidth.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/MasterOfEnchanting/32599-birth.htm similarity index 100% rename from L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/MasterOfEnchanting/32599-bidth.htm rename to L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/MasterOfEnchanting/32599-birth.htm diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index d86f762d55..0898d8dbc5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -87,11 +87,11 @@ public class MasterOfEnchanting extends LongTimeEvent else if (event.equalsIgnoreCase("buy_scroll_24")) { final long curTime = System.currentTimeMillis(); - final String value = player.getVariables().getString("MasterOfEnchanting"); + final String value = player.getVariables().getString("MasterOfEnchanting", ""); final long reuse = value.equals("") ? 0 : Long.parseLong(value); if (player.getCreateDate().after(getEventPeriod().getStartDate())) { - return "32599-bidth.htm"; + return "32599-birth.htm"; } if (curTime > reuse) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/MasterOfEnchanting/32599-bidth.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/MasterOfEnchanting/32599-birth.htm similarity index 100% rename from L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/MasterOfEnchanting/32599-bidth.htm rename to L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/MasterOfEnchanting/32599-birth.htm diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index d86f762d55..0898d8dbc5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -87,11 +87,11 @@ public class MasterOfEnchanting extends LongTimeEvent else if (event.equalsIgnoreCase("buy_scroll_24")) { final long curTime = System.currentTimeMillis(); - final String value = player.getVariables().getString("MasterOfEnchanting"); + final String value = player.getVariables().getString("MasterOfEnchanting", ""); final long reuse = value.equals("") ? 0 : Long.parseLong(value); if (player.getCreateDate().after(getEventPeriod().getStartDate())) { - return "32599-bidth.htm"; + return "32599-birth.htm"; } if (curTime > reuse) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/MasterOfEnchanting/32599-bidth.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/MasterOfEnchanting/32599-birth.htm similarity index 100% rename from L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/MasterOfEnchanting/32599-bidth.htm rename to L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/MasterOfEnchanting/32599-birth.htm diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index bdaa5863c4..241482d1cb 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -87,11 +87,11 @@ public class MasterOfEnchanting extends LongTimeEvent else if (event.equalsIgnoreCase("buy_scroll_24")) { final long curTime = System.currentTimeMillis(); - final String value = player.getVariables().getString("MasterOfEnchanting"); + final String value = player.getVariables().getString("MasterOfEnchanting", ""); final long reuse = value.equals("") ? 0 : Long.parseLong(value); if (player.getCreateDate().after(getEventPeriod().getStartDate())) { - return "32599-bidth.htm"; + return "32599-birth.htm"; } if (curTime > reuse) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/MasterOfEnchanting/32599-bidth.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/MasterOfEnchanting/32599-birth.htm similarity index 100% rename from L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/MasterOfEnchanting/32599-bidth.htm rename to L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/MasterOfEnchanting/32599-birth.htm diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index fc65c66055..f7d34dfccd 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -87,11 +87,11 @@ public class MasterOfEnchanting extends LongTimeEvent else if (event.equalsIgnoreCase("buy_scroll_24")) { final long curTime = System.currentTimeMillis(); - final String value = player.getVariables().getString("MasterOfEnchanting"); + final String value = player.getVariables().getString("MasterOfEnchanting", ""); final long reuse = value.equals("") ? 0 : Long.parseLong(value); if (player.getCreateDate().after(getEventPeriod().getStartDate())) { - return "32599-bidth.htm"; + return "32599-birth.htm"; } if (curTime > reuse) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/MasterOfEnchanting/32599-bidth.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/MasterOfEnchanting/32599-birth.htm similarity index 100% rename from L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/MasterOfEnchanting/32599-bidth.htm rename to L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/MasterOfEnchanting/32599-birth.htm diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index 8ae351a447..48a2a27c8d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -87,11 +87,11 @@ public class MasterOfEnchanting extends LongTimeEvent else if (event.equalsIgnoreCase("buy_scroll_24")) { final long curTime = System.currentTimeMillis(); - final String value = player.getVariables().getString("MasterOfEnchanting"); + final String value = player.getVariables().getString("MasterOfEnchanting", ""); final long reuse = value.equals("") ? 0 : Long.parseLong(value); if (player.getCreateDate().after(getEventPeriod().getStartDate())) { - return "32599-bidth.htm"; + return "32599-birth.htm"; } if (curTime > reuse) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/MasterOfEnchanting/32599-bidth.htm b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/MasterOfEnchanting/32599-birth.htm similarity index 100% rename from L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/MasterOfEnchanting/32599-bidth.htm rename to L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/MasterOfEnchanting/32599-birth.htm diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index fc65c66055..f7d34dfccd 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -87,11 +87,11 @@ public class MasterOfEnchanting extends LongTimeEvent else if (event.equalsIgnoreCase("buy_scroll_24")) { final long curTime = System.currentTimeMillis(); - final String value = player.getVariables().getString("MasterOfEnchanting"); + final String value = player.getVariables().getString("MasterOfEnchanting", ""); final long reuse = value.equals("") ? 0 : Long.parseLong(value); if (player.getCreateDate().after(getEventPeriod().getStartDate())) { - return "32599-bidth.htm"; + return "32599-birth.htm"; } if (curTime > reuse) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/MasterOfEnchanting/32599-bidth.htm b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/MasterOfEnchanting/32599-birth.htm similarity index 100% rename from L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/MasterOfEnchanting/32599-bidth.htm rename to L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/MasterOfEnchanting/32599-birth.htm diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index 767ae288fe..76cf351c57 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -87,11 +87,11 @@ public class MasterOfEnchanting extends LongTimeEvent else if (event.equalsIgnoreCase("buy_scroll_24")) { final long curTime = System.currentTimeMillis(); - final String value = player.getVariables().getString("MasterOfEnchanting"); + final String value = player.getVariables().getString("MasterOfEnchanting", ""); final long reuse = value.equals("") ? 0 : Long.parseLong(value); if (player.getCreateDate().after(getEventPeriod().getStartDate())) { - return "32599-bidth.htm"; + return "32599-birth.htm"; } if (curTime > reuse) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/MasterOfEnchanting/32599-bidth.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/MasterOfEnchanting/32599-birth.htm similarity index 100% rename from L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/MasterOfEnchanting/32599-bidth.htm rename to L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/MasterOfEnchanting/32599-birth.htm diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index 767ae288fe..76cf351c57 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -87,11 +87,11 @@ public class MasterOfEnchanting extends LongTimeEvent else if (event.equalsIgnoreCase("buy_scroll_24")) { final long curTime = System.currentTimeMillis(); - final String value = player.getVariables().getString("MasterOfEnchanting"); + final String value = player.getVariables().getString("MasterOfEnchanting", ""); final long reuse = value.equals("") ? 0 : Long.parseLong(value); if (player.getCreateDate().after(getEventPeriod().getStartDate())) { - return "32599-bidth.htm"; + return "32599-birth.htm"; } if (curTime > reuse)