BETA/STABLE: HP/CP Recovery shouldn't be used from inside the pvp zone

* Fixed spawns of monster derby track

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ArenaBuff.java

@@ -67,8 +67,7 @@ public class ArenaBuff implements IBypassHandler
 			String cmd = st.nextToken();
 			
 			if (cmd.equalsIgnoreCase(COMMANDS[0]))
-			{
-				
+			{	
 				if (!activeChar.reduceAdena("ArenaBuffs", 2000, activeChar.getLastFolkNPC(), true))
 				{
 					return false;
@@ -88,7 +87,11 @@ public class ArenaBuff implements IBypassHandler
 			}
 			else if (cmd.equalsIgnoreCase(COMMANDS[1]))
 			{
-				if (!activeChar.reduceAdena("RestoreHP", 1000, activeChar.getLastFolkNPC(), true))
+				if (activeChar.isInsideZone(L2Character.ZONE_PVP)) // Cannot be used while inside the pvp zone
+				{
+					return false;
+				}
+				else if (!activeChar.reduceAdena("RestoreHP", 1000, activeChar.getLastFolkNPC(), true))
 				{
 					return false;
 				}
@@ -103,7 +106,11 @@ public class ArenaBuff implements IBypassHandler
 			}
 			else if (cmd.equalsIgnoreCase(COMMANDS[2]))
 			{
-				if (!activeChar.reduceAdena("RestoreCP", 1000, activeChar.getLastFolkNPC(), true))
+				if (activeChar.isInsideZone(L2Character.ZONE_PVP)) // Cannot be used while inside the pvp zone
+				{
+					return false;
+				}
+				else if (!activeChar.reduceAdena("RestoreCP", 1000, activeChar.getLastFolkNPC(), true))
 				{
 					return false;
 				}

L2J_DataPack_BETA/dist/sql/game/spawnlist.sql

@@ -20309,7 +20309,9 @@ INSERT INTO `spawnlist` VALUES
 ('dion16_npc2023_09',1,30627,10133,157155,-2383,0,0,0,60,0,0),
 ('dion09_npc2023_10',1,30979,50693,158674,376,0,0,0,60,0,0),
 ('dion12_npc2023_02',1,31210,12882,181053,-3560,0,0,49152,60,0,0),
-('dion22_npc2023_02',1,31225,11970,183588,-3560,0,0,0,60,0,0),
+('dion22_npc2023_02',1,31225,11970,183588,-3560,0,0,61313,60,0,0), -- Arena Manager
+('dion22_npc2023_03',1,31690,-15104,122040,-3048,0,0,3000,60,0,0), -- Monument of Heroes
+('dion22_npc2023_04',1,31688,-15120,122096,-3064,0,0,3000,60,0,0), -- Grand Olympiad Manager
 ('dion02_npc2122_01',1,30631,44694,146500,-3682,0,0,12288,60,0,0),
 ('dion02_npc2122_02',1,30632,45411,149100,-3681,0,0,42000,60,0,0),
 ('giran01_npc2121_01',1,30752,64001,126486,-2016,0,0,0,60,0,0),