From 6d6030f9d32c792342491abb68f5f72497eda797 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 4 Feb 2020 15:52:59 +0000
Subject: [PATCH] Admin menu appearance changes.
---
.../dist/game/config/AdminCommands.xml | 4 +-
.../dist/game/config/main/Access.ini | 4 -
.../dist/game/data/html/admin/admhelp.htm | 7 +-
.../dist/game/data/html/admin/announce.htm | 10 +--
.../dist/game/data/html/admin/charinfo.htm | 45 +++++------
.../dist/game/data/html/admin/charlist.htm | 4 +-
.../dist/game/data/html/admin/charskills.htm | 20 ++---
.../game/data/html/admin/classic_menu.htm | 44 -----------
.../game/data/html/admin/effects_menu.htm | 20 ++---
.../dist/game/data/html/admin/expsp.htm | 6 +-
.../dist/game/data/html/admin/game_menu.htm | 36 ++++-----
.../game/data/html/admin/help/changes.htm | 14 ----
.../game/data/html/admin/help/game_menu.htm | 6 +-
.../game/data/html/admin/help/license.htm | 14 ----
.../game/data/html/admin/help/license2.htm | 9 ---
.../game/data/html/admin/help/main_menu.htm | 8 +-
.../game/data/html/admin/help/main_menu5.htm | 6 +-
.../dist/game/data/html/admin/help/readme.htm | 10 ---
.../dist/game/data/html/admin/help/toa.htm | 20 +++++
.../game/data/html/admin/itemcreation.htm | 52 ++++---------
.../dist/game/data/html/admin/login.htm | 19 +++--
.../dist/game/data/html/admin/main_menu.htm | 17 ++--
.../dist/game/data/html/admin/mods_menu.htm | 16 ++--
.../dist/game/data/html/admin/reload_menu.htm | 48 +++++-------
.../dist/game/data/html/admin/server_menu.htm | 33 ++++----
.../dist/game/data/html/admin/shutdown.htm | 12 +--
.../dist/game/data/html/admin/teleports.htm | 12 ++-
.../java/org/l2jmobius/Config.java | 2 -
.../admincommandhandlers/AdminAdmin.java | 17 +---
.../admincommandhandlers/AdminCreateItem.java | 77 +++++++++++--------
.../admincommandhandlers/AdminShutdown.java | 2 +-
.../model/actor/instance/DoorInstance.java | 8 +-
.../model/actor/instance/NpcInstance.java | 19 ++---
33 files changed, 250 insertions(+), 371 deletions(-)
delete mode 100644 L2J_Mobius_C6_Interlude/dist/game/data/html/admin/classic_menu.htm
delete mode 100644 L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/changes.htm
delete mode 100644 L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/license.htm
delete mode 100644 L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/license2.htm
delete mode 100644 L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/readme.htm
create mode 100644 L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/toa.htm
diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/AdminCommands.xml b/L2J_Mobius_C6_Interlude/dist/game/config/AdminCommands.xml
index 481a0a1e5f..f548c6b32b 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/config/AdminCommands.xml
+++ b/L2J_Mobius_C6_Interlude/dist/game/config/AdminCommands.xml
@@ -6,7 +6,6 @@
-
@@ -66,6 +65,8 @@
+
+
@@ -187,6 +188,7 @@
+
diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/Access.ini b/L2J_Mobius_C6_Interlude/dist/game/config/main/Access.ini
index e986a6e126..c160b4891c 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/config/main/Access.ini
+++ b/L2J_Mobius_C6_Interlude/dist/game/config/main/Access.ini
@@ -6,10 +6,6 @@
# If next switch set to true every created character will have Admin access.
EverybodyHasAdminRights = False
-# The way //admin panel looks can be "modern" or "classic"
-# (default is modern while classic provides more compatibility)
-GMAdminMenuStyle = modern
-
# Enable GMs to have the glowing aura of a Hero character.
GMHeroAura = False
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/admhelp.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/admhelp.htm
index 58989ffcfa..dcbf717f73 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/admhelp.htm
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/admhelp.htm
@@ -8,14 +8,11 @@
-This is the legacy help system, out of the license and general information, there are some lists with commands but have not been actively maintained and could be out of date.
+This is the legacy help system, out of the TOA, there are some lists with commands but have not been actively maintained and could be out of date.
Despite this information can be of great aid for macroing and whatnot, the inexperienced game master should rely in the admin panels and the information they provide.
- Note: Don't forget that modifying players skills can ruin the game...
-
-
+
Editing %name%, %class% lvl %level%.
+
-
-
+
+
-
-
+
+
-
-
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/classic_menu.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/classic_menu.htm
deleted file mode 100644
index c309a6e9a0..0000000000
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/classic_menu.htm
+++ /dev/null
@@ -1,44 +0,0 @@
-
Admin Panel - Classic mode
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Name / Karma / Ench 0-1000000:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/effects_menu.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/effects_menu.htm
index fc1809d107..484aae677c 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/effects_menu.htm
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/effects_menu.htm
@@ -1,21 +1,17 @@
Admin Panel - Effects Menu
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
QuickBox:
-Trasformations:
+Trasformations
@@ -32,7 +28,7 @@
-Others:
+Others
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/expsp.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/expsp.htm
index fca494c1da..cd0dac5d47 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/expsp.htm
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/expsp.htm
@@ -17,13 +17,13 @@ and use 0 if no changes are needed.
Exp:
SP:
-
-
+
+
or
Set the new character level by using the dialog below:
Level
-
+
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/game_menu.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/game_menu.htm
index df3673afa2..2310bfe9ed 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/game_menu.htm
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/game_menu.htm
@@ -1,26 +1,22 @@
Admin Panel - Game Menu
-
-Server Changes:
-Visit our forum for Bug Repport: l2jmobius.org
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/game_menu.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/game_menu.htm
index 27f888d480..0684873358 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/game_menu.htm
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/game_menu.htm
@@ -1,8 +1,8 @@
Effects Panel
2-Game Panel Buttons
L2 specifics are here: characters, pledges, cursed weapons and static events.
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/license.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/license.htm
deleted file mode 100644
index 98b3ae0f6b..0000000000
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/license.htm
+++ /dev/null
@@ -1,14 +0,0 @@
-Admin Help
-
-
-
-
Help Menu
-
-
-
-
-
License:
-
-
This program is free software.
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/license2.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/license2.htm
deleted file mode 100644
index fc8688d4ca..0000000000
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/license2.htm
+++ /dev/null
@@ -1,9 +0,0 @@
-Admin Help
-
-
-
-
Help Menu
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/main_menu.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/main_menu.htm
index 838790eecb..dc2ca805c2 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/main_menu.htm
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/main_menu.htm
@@ -1,8 +1,8 @@
-L2Scroia Help
+Help
1-Main Panel Buttons
1-4 The little cool things that can make you feel special.
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/readme.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/readme.htm
deleted file mode 100644
index 9985f77462..0000000000
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/readme.htm
+++ /dev/null
@@ -1,10 +0,0 @@
-Admin Help
-
-
-
-
Help Menu
-
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/toa.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/toa.htm
new file mode 100644
index 0000000000..953cfa47f2
--- /dev/null
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/help/toa.htm
@@ -0,0 +1,20 @@
+Terms Of Agreement
+
+
+
+
Help Menu
+
+
+
+
TERMS OF AGREEMENT
+Using L2jMobius, you accept the following:
+This is a hobbyist project that is in no way meant to be used for running illegal servers.
+You can't sell L2jMobius pack, customized or not.
+You can't share any revision posterior to current free revision.
+Work deriving from leaked sources may be merged with project under GPLv3 terms.
+L2jMobius forks are allowed for following conditions:
+Your pack stays open source (in order useful fixes can be used in the main pack).
+You can use any of the free versions as base.
+You don't update it with revisions posterior to current free revision.
+Work deriving from forks may be merged with project under GPLv3 terms.
+
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/itemcreation.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/itemcreation.htm
index 139efb1ee7..3d2fbb189a 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/itemcreation.htm
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/itemcreation.htm
@@ -1,18 +1,14 @@
Items
-
-
-
+
+
Item Creation Menu
-
-
-
+
+
Fill the ID number in item-id to create the item that
you want, use amount if you need more than one.
-
Caution: Max amount for stackable items is 20
-
-
Use //mass_create to spawn items in every online character
+
//mass_create spawns items for all online players.
@@ -20,34 +16,20 @@
Item-ID:
Amount:
-
+
-
-
-
-
Use //clear_inventory to delete all unequiped items in your inventory.
-
-
-
-
-
-
-
-
Assets:
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
Assets
+
+
Coin Type:
+
+
Amount:
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/login.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/login.htm
index ed09032b27..cec7b08353 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/login.htm
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/login.htm
@@ -1,7 +1,7 @@
Login server
-
+
-
Server Management Menu
+
Server Management Menu
@@ -9,7 +9,6 @@
Max Players:
-
Registered as:
%server_name%
@@ -20,12 +19,12 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/main_menu.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/main_menu.htm
index 28be9a610a..22aa7852a9 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/main_menu.htm
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/main_menu.htm
@@ -1,10 +1,9 @@
Admin Panel - Main Menu
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/reload_menu.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/reload_menu.htm
index 48b50c2828..44b212f020 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/reload_menu.htm
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/reload_menu.htm
@@ -1,32 +1,22 @@
Reload Menu
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-Reload Menu //reload type
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+Reload Menu //reload type
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/server_menu.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/server_menu.htm
index 2a97c0cc88..37f0a9df5c 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/server_menu.htm
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/server_menu.htm
@@ -1,19 +1,15 @@
Admin Panel - Server Management
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
QuickBox:
-Reload:
+Reload
@@ -31,16 +27,15 @@
-Geodata:
+Geodata
-
-
-
-
-
+
+
+
+
-Development:
+Development
@@ -48,7 +43,7 @@
-Maintenance:
+Maintenance
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/shutdown.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/shutdown.htm
index af73660f00..3f18272675 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/shutdown.htm
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/shutdown.htm
@@ -1,13 +1,13 @@
Shutdown Server
-
+
-
Server Management
+
Server Management Menu
+
Shutdown time:
-
Players Online:
%count%
@@ -16,8 +16,8 @@
Game Time:
%time%
-
-
-
+
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/teleports.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/teleports.htm
index c7259776c8..6ba879cafb 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/teleports.htm
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/teleports.htm
@@ -1,5 +1,9 @@
-Teleport
\ No newline at end of file
+Move to given Coords:
X:
Y:
Z:
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java
index 9317f35404..bb3fb4cecb 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java
@@ -117,7 +117,6 @@ public class Config
public static boolean GM_SPECIAL_EFFECT;
public static boolean GM_STARTUP_SILENCE;
public static boolean GM_STARTUP_AUTO_LIST;
- public static String GM_ADMIN_MENU_STYLE;
public static boolean GM_HERO_AURA;
public static boolean GM_STARTUP_BUILDER_HIDE;
public static boolean GM_STARTUP_INVULNERABLE;
@@ -1167,7 +1166,6 @@ public class Config
EVERYBODY_HAS_ADMIN_RIGHTS = Boolean.parseBoolean(accessSettings.getProperty("EverybodyHasAdminRights", "false"));
GM_STARTUP_AUTO_LIST = Boolean.parseBoolean(accessSettings.getProperty("GMStartupAutoList", "true"));
- GM_ADMIN_MENU_STYLE = accessSettings.getProperty("GMAdminMenuStyle", "modern");
GM_HERO_AURA = Boolean.parseBoolean(accessSettings.getProperty("GMHeroAura", "false"));
GM_STARTUP_BUILDER_HIDE = Boolean.parseBoolean(accessSettings.getProperty("GMStartupBuilderHide", "true"));
GM_STARTUP_INVULNERABLE = Boolean.parseBoolean(accessSettings.getProperty("GMStartupInvulnerable", "true"));
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminAdmin.java
index 9c19bd747a..1581993049 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminAdmin.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminAdmin.java
@@ -43,7 +43,6 @@ public class AdminAdmin implements IAdminCommandHandler
"admin_admin2",
"admin_admin3",
"admin_admin4",
- "admin_admin5",
"admin_gmliston",
"admin_gmlistoff",
"admin_silence",
@@ -62,7 +61,6 @@ public class AdminAdmin implements IAdminCommandHandler
admin_admin2,
admin_admin3,
admin_admin4,
- admin_admin5,
admin_gmliston,
admin_gmlistoff,
admin_silence,
@@ -93,7 +91,6 @@ public class AdminAdmin implements IAdminCommandHandler
case admin_admin2:
case admin_admin3:
case admin_admin4:
- case admin_admin5:
{
showMainPage(activeChar, command);
return true;
@@ -302,21 +299,9 @@ public class AdminAdmin implements IAdminCommandHandler
filename = "server";
break;
}
- case 5:
- {
- filename = "mods";
- break;
- }
default:
{
- if (Config.GM_ADMIN_MENU_STYLE.equals("modern"))
- {
- filename = "main";
- }
- else
- {
- filename = "classic";
- }
+ filename = "main";
break;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java
index b8cbce1a71..31023586e8 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCreateItem.java
@@ -40,11 +40,10 @@ public class AdminCreateItem implements IAdminCommandHandler
private static final Logger LOGGER = Logger.getLogger(AdminCreateItem.class.getName());
private static final String[] ADMIN_COMMANDS =
{
- "admin_l2jmobius",
"admin_itemcreate",
"admin_create_item",
"admin_mass_create",
- "admin_clear_inventory"
+ "admin_create_coin"
};
private enum CommandEnum
@@ -52,7 +51,7 @@ public class AdminCreateItem implements IAdminCommandHandler
admin_itemcreate,
admin_create_item,
admin_mass_create,
- admin_clear_inventory
+ admin_create_coin
}
@Override
@@ -61,7 +60,6 @@ public class AdminCreateItem implements IAdminCommandHandler
final StringTokenizer st = new StringTokenizer(command);
final CommandEnum comm = CommandEnum.valueOf(st.nextToken());
-
if (comm == null)
{
return false;
@@ -183,9 +181,23 @@ public class AdminCreateItem implements IAdminCommandHandler
}
return false;
}
- case admin_clear_inventory:
+ case admin_create_coin:
{
- removeAllItems(activeChar);
+ try
+ {
+ final int id = getCoinId(st.nextToken());
+ if (id <= 0)
+ {
+ activeChar.sendMessage("Usage: //create_coin [amount]");
+ return false;
+ }
+
+ createItem(activeChar, id, (st.hasMoreTokens()) ? Integer.parseInt(st.nextToken()) : 1);
+ }
+ catch (Exception e)
+ {
+ activeChar.sendMessage("Usage: //create_coin [amount]");
+ }
return true;
}
default:
@@ -195,10 +207,24 @@ public class AdminCreateItem implements IAdminCommandHandler
}
}
- @Override
- public String[] getAdminCommandList()
+ private static int getCoinId(String name)
{
- return ADMIN_COMMANDS;
+ if (name.equalsIgnoreCase("adena"))
+ {
+ return 57;
+ }
+
+ if (name.equalsIgnoreCase("ancientadena"))
+ {
+ return 5575;
+ }
+
+ if (name.equalsIgnoreCase("festivaladena"))
+ {
+ return 6673;
+ }
+
+ return 0;
}
private void createItem(PlayerInstance activeChar, int id, int num)
@@ -215,7 +241,6 @@ public class AdminCreateItem implements IAdminCommandHandler
}
PlayerInstance player = null;
-
if (activeChar.getTarget() != null)
{
if (activeChar.getTarget() instanceof PlayerInstance)
@@ -243,29 +268,26 @@ public class AdminCreateItem implements IAdminCommandHandler
player = activeChar;
}
- player.getInventory().addItem("Admin", id, num, player, null);
+ final ItemInstance newItem = player.getInventory().addItem("Admin", id, num, player, null);
player.sendPacket(new ItemList(player, true));
if (activeChar.getName().equalsIgnoreCase(player.getName()))
{
- BuilderUtil.sendSysMessage(activeChar, "You have spawned " + num + " item(s) number " + id + " in your inventory.");
+ BuilderUtil.sendSysMessage(activeChar, "You have spawned " + num + " " + newItem.getItemName() + " (" + id + ") in your inventory.");
}
else
{
- BuilderUtil.sendSysMessage(activeChar, "You have spawned " + num + " item(s) number " + id + " in " + player.getName() + "'s inventory.");
- player.sendMessage("Admin has spawned " + num + " item(s) number " + id + " in your inventory.");
+ BuilderUtil.sendSysMessage(activeChar, "You have spawned " + num + " " + newItem.getItemName() + " (" + id + ") in " + player.getName() + "'s inventory.");
+ player.sendMessage("Admin has spawned " + num + " " + newItem.getItemName() + " (" + id + ") in your inventory.");
}
}
private void massCreateItem(PlayerInstance activeChar, int id, int num)
{
- if (num > 20)
+ final Item template = ItemTable.getInstance().getTemplate(id);
+ if ((template != null) && !template.isStackable())
{
- final Item template = ItemTable.getInstance().getTemplate(id);
- if ((template != null) && !template.isStackable())
- {
- BuilderUtil.sendSysMessage(activeChar, "This item does not stack - Creation aborted.");
- return;
- }
+ BuilderUtil.sendSysMessage(activeChar, "This item does not stack - Creation aborted.");
+ return;
}
int i = 0;
@@ -287,16 +309,9 @@ public class AdminCreateItem implements IAdminCommandHandler
LOGGER.info("GM " + activeChar.getName() + " mass_created item Id: " + id + " (" + num + ")");
}
- private void removeAllItems(PlayerInstance activeChar)
+ @Override
+ public String[] getAdminCommandList()
{
- for (ItemInstance item : activeChar.getInventory().getItems())
- {
- if (item.getItemLocation() == ItemInstance.ItemLocation.INVENTORY)
- {
- activeChar.getInventory().destroyItem("Destroy", item.getObjectId(), item.getCount(), activeChar, null);
- }
- }
- activeChar.sendPacket(new ItemList(activeChar, false));
- BuilderUtil.sendSysMessage(activeChar, "Your inventory has been cleared.");
+ return ADMIN_COMMANDS;
}
}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminShutdown.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminShutdown.java
index 5e4225fa58..ad8cfdea84 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminShutdown.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminShutdown.java
@@ -136,7 +136,7 @@ public class AdminShutdown implements IAdminCommandHandler
final int h = t / 60;
final int m = t % 60;
- final SimpleDateFormat format = new SimpleDateFormat("h:mm a");
+ final SimpleDateFormat format = new SimpleDateFormat("h:mm");
final Calendar cal = Calendar.getInstance();
cal.set(Calendar.HOUR_OF_DAY, h);
cal.set(Calendar.MINUTE, m);
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java
index cbf528997f..0950ef1e2a 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java
@@ -599,10 +599,10 @@ public class DoorInstance extends Creature
html1.append("
");
html1.append("
");
html1.append("
");
- html1.append("
");
- html1.append("
");
- html1.append("
");
- html1.append("
");
+ html1.append("
");
+ html1.append("
");
+ html1.append("
");
+ html1.append("
");
html1.append("
");
html.setHtml(html1.toString());
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
index 2240527ae8..ff72c99083 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
@@ -852,7 +852,14 @@ public class NpcInstance extends Creature
final NpcHtmlMessage html = new NpcHtmlMessage(0);
final StringBuilder html1 = new StringBuilder("