From 67036016489871eaafdeab8b3ee816c447201d84 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 14 Jun 2020 18:03:50 +0000 Subject: [PATCH] Removed Rune and Schuttgart SQL clanhall entries. --- .../dist/db_installer/sql/game/auction.sql | 24 +++++++++---------- .../dist/db_installer/sql/game/clanhall.sql | 22 ++++++++--------- .../model/zone/type/ClanHallZone.java | 8 +++++-- 3 files changed, 29 insertions(+), 25 deletions(-) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/auction.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/auction.sql index 15494aeb2c..2c2ced0587 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/auction.sql +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/auction.sql @@ -49,15 +49,15 @@ INSERT IGNORE INTO `auction` VALUES (47, 0, 'NPC', 'NPC Clan', 'ClanHall', 47, 0, 'Moonstone Hall', 1, 50000000, 0, 1164841200000), (48, 0, 'NPC', 'NPC Clan', 'ClanHall', 48, 0, 'Onyx Hall', 1, 50000000, 0, 1164841200000), (49, 0, 'NPC', 'NPC Clan', 'ClanHall', 49, 0, 'Emerald Hall', 1, 50000000, 0, 1164841200000), -(50, 0, 'NPC', 'NPC Clan', 'ClanHall', 50, 0, 'Sapphire Hall', 1, 50000000, 0, 1164841200000), -(51, 0, 'NPC', 'NPC Clan', 'ClanHall', 51, 0, 'Mont Chamber', 1, 50000000, 0, 1164841200000), -(52, 0, 'NPC', 'NPC Clan', 'ClanHall', 52, 0, 'Astaire Chamber', 1, 50000000, 0, 1164841200000), -(53, 0, 'NPC', 'NPC Clan', 'ClanHall', 53, 0, 'Aria Chamber', 1, 50000000, 0, 1164841200000), -(54, 0, 'NPC', 'NPC Clan', 'ClanHall', 54, 0, 'Yiana Chamber', 1, 50000000, 0, 1164841200000), -(55, 0, 'NPC', 'NPC Clan', 'ClanHall', 55, 0, 'Roien Chamber', 1, 50000000, 0, 1164841200000), -(56, 0, 'NPC', 'NPC Clan', 'ClanHall', 56, 0, 'Luna Chamber', 1, 50000000, 0, 1164841200000), -(57, 0, 'NPC', 'NPC Clan', 'ClanHall', 57, 0, 'Traban Chamber', 1, 50000000, 0, 1164841200000), -(58, 0, 'NPC', 'NPC Clan', 'ClanHall', 58, 0, 'Eisen Hall', 1, 50000000, 0, 1164841200000), -(59, 0, 'NPC', 'NPC Clan', 'ClanHall', 59, 0, 'Heavy Metal Hall', 1, 50000000, 0, 1164841200000), -(60, 0, 'NPC', 'NPC Clan', 'ClanHall', 60, 0, 'Molten Ore Hall', 1, 50000000, 0, 1164841200000), -(61, 0, 'NPC', 'NPC Clan', 'ClanHall', 61, 0, 'Titan Hall', 1, 50000000, 0, 1164841200000); +(50, 0, 'NPC', 'NPC Clan', 'ClanHall', 50, 0, 'Sapphire Hall', 1, 50000000, 0, 1164841200000); +-- (51, 0, 'NPC', 'NPC Clan', 'ClanHall', 51, 0, 'Mont Chamber', 1, 50000000, 0, 1164841200000), +-- (52, 0, 'NPC', 'NPC Clan', 'ClanHall', 52, 0, 'Astaire Chamber', 1, 50000000, 0, 1164841200000), +-- (53, 0, 'NPC', 'NPC Clan', 'ClanHall', 53, 0, 'Aria Chamber', 1, 50000000, 0, 1164841200000), +-- (54, 0, 'NPC', 'NPC Clan', 'ClanHall', 54, 0, 'Yiana Chamber', 1, 50000000, 0, 1164841200000), +-- (55, 0, 'NPC', 'NPC Clan', 'ClanHall', 55, 0, 'Roien Chamber', 1, 50000000, 0, 1164841200000), +-- (56, 0, 'NPC', 'NPC Clan', 'ClanHall', 56, 0, 'Luna Chamber', 1, 50000000, 0, 1164841200000), +-- (57, 0, 'NPC', 'NPC Clan', 'ClanHall', 57, 0, 'Traban Chamber', 1, 50000000, 0, 1164841200000), +-- (58, 0, 'NPC', 'NPC Clan', 'ClanHall', 58, 0, 'Eisen Hall', 1, 50000000, 0, 1164841200000), +-- (59, 0, 'NPC', 'NPC Clan', 'ClanHall', 59, 0, 'Heavy Metal Hall', 1, 50000000, 0, 1164841200000), +-- (60, 0, 'NPC', 'NPC Clan', 'ClanHall', 60, 0, 'Molten Ore Hall', 1, 50000000, 0, 1164841200000), +-- (61, 0, 'NPC', 'NPC Clan', 'ClanHall', 61, 0, 'Titan Hall', 1, 50000000, 0, 1164841200000); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clanhall.sql b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clanhall.sql index 0a0ed745dd..fdead358cf 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clanhall.sql +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/db_installer/sql/game/clanhall.sql @@ -47,17 +47,17 @@ INSERT IGNORE INTO `clanhall` VALUES ('47','Moonstone Hall','0','100000','Clan h INSERT IGNORE INTO `clanhall` VALUES ('48','Onyx Hall','0','100000','Clan hall located in the Town of Goddard','Goddard','0','3','0'); INSERT IGNORE INTO `clanhall` VALUES ('49','Emerald Hall','0','100000','Clan hall located in the Town of Goddard','Goddard','0','3','0'); INSERT IGNORE INTO `clanhall` VALUES ('50','Sapphire Hall','0','100000','Clan hall located in the Town of Goddard','Goddard','0','3','0'); -INSERT IGNORE INTO `clanhall` VALUES ('51','Mont Chamber','0','100000','An upscale Clan hall located in the Rune Township','Rune','0','3','0'); -INSERT IGNORE INTO `clanhall` VALUES ('52','Astaire Chamber','0','100000','An upscale Clan hall located in the Rune Township','Rune','0','3','0'); -INSERT IGNORE INTO `clanhall` VALUES ('53','Aria Chamber','0','100000','An upscale Clan hall located in the Rune Township','Rune','0','3','0'); -INSERT IGNORE INTO `clanhall` VALUES ('54','Yiana Chamber','0','100000','An upscale Clan hall located in the Rune Township','Rune','0','3','0'); -INSERT IGNORE INTO `clanhall` VALUES ('55','Roien Chamber','0','100000','An upscale Clan hall located in the Rune Township','Rune','0','3','0'); -INSERT IGNORE INTO `clanhall` VALUES ('56','Luna Chamber','0','100000','An upscale Clan hall located in the Rune Township','Rune','0','3','0'); -INSERT IGNORE INTO `clanhall` VALUES ('57','Traban Chamber','0','100000','An upscale Clan hall located in the Rune Township','Rune','0','3','0'); -INSERT IGNORE INTO `clanhall` VALUES ('58','Eisen Hall','0','100000','Clan hall located in the Town of Schuttgart','Schuttgart','0','2','0'); -INSERT IGNORE INTO `clanhall` VALUES ('59','Heavy Metal Hall','0','100000','Clan hall located in the Town of Schuttgart','Schuttgart','0','2','0'); -INSERT IGNORE INTO `clanhall` VALUES ('60','Molten Ore Hall','0','100000','Clan hall located in the Town of Schuttgart','Schuttgart','0','2','0'); -INSERT IGNORE INTO `clanhall` VALUES ('61','Titan Hall','0','100000','Clan hall located in the Town of Schuttgart','Schuttgart','0','2','0'); +-- INSERT IGNORE INTO `clanhall` VALUES ('51','Mont Chamber','0','100000','An upscale Clan hall located in the Rune Township','Rune','0','3','0'); +-- INSERT IGNORE INTO `clanhall` VALUES ('52','Astaire Chamber','0','100000','An upscale Clan hall located in the Rune Township','Rune','0','3','0'); +-- INSERT IGNORE INTO `clanhall` VALUES ('53','Aria Chamber','0','100000','An upscale Clan hall located in the Rune Township','Rune','0','3','0'); +-- INSERT IGNORE INTO `clanhall` VALUES ('54','Yiana Chamber','0','100000','An upscale Clan hall located in the Rune Township','Rune','0','3','0'); +-- INSERT IGNORE INTO `clanhall` VALUES ('55','Roien Chamber','0','100000','An upscale Clan hall located in the Rune Township','Rune','0','3','0'); +-- INSERT IGNORE INTO `clanhall` VALUES ('56','Luna Chamber','0','100000','An upscale Clan hall located in the Rune Township','Rune','0','3','0'); +-- INSERT IGNORE INTO `clanhall` VALUES ('57','Traban Chamber','0','100000','An upscale Clan hall located in the Rune Township','Rune','0','3','0'); +-- INSERT IGNORE INTO `clanhall` VALUES ('58','Eisen Hall','0','100000','Clan hall located in the Town of Schuttgart','Schuttgart','0','2','0'); +-- INSERT IGNORE INTO `clanhall` VALUES ('59','Heavy Metal Hall','0','100000','Clan hall located in the Town of Schuttgart','Schuttgart','0','2','0'); +-- INSERT IGNORE INTO `clanhall` VALUES ('60','Molten Ore Hall','0','100000','Clan hall located in the Town of Schuttgart','Schuttgart','0','2','0'); +-- INSERT IGNORE INTO `clanhall` VALUES ('61','Titan Hall','0','100000','Clan hall located in the Town of Schuttgart','Schuttgart','0','2','0'); INSERT IGNORE INTO `clanhall` VALUES ('62','Rainbow Springs','0','100000','','HotSpring','0','3','0'); INSERT IGNORE INTO `clanhall` VALUES ('63','Beast Farm','0','100000','','BeastFarm','0','3','0'); INSERT IGNORE INTO `clanhall` VALUES ('64','Fortress of the Dead','0','100000','','DeadForest','0','3','0'); \ No newline at end of file diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java index cdadf9a45e..671c68724e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.ClanHallManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.zone.ZoneRespawn; import org.l2jmobius.gameserver.model.zone.ZoneId; +import org.l2jmobius.gameserver.model.zone.ZoneRespawn; import org.l2jmobius.gameserver.network.serverpackets.ClanHallDecoration; /** @@ -47,7 +47,11 @@ public class ClanHallZone extends ZoneRespawn { _clanHallId = Integer.parseInt(value); // Register self to the correct clan hall - ClanHallManager.getInstance().getClanHallById(_clanHallId).setZone(this); + final ClanHall ch = ClanHallManager.getInstance().getClanHallById(_clanHallId); + if (ch != null) + { + ClanHallManager.getInstance().getClanHallById(_clanHallId).setZone(this); + } break; } default: