diff --git a/Server/server.sql b/Server/server.sql index 9c822e2bd..988f53b06 100644 --- a/Server/server.sql +++ b/Server/server.sql @@ -19628,6 +19628,7 @@ CREATE TABLE `npc_spawns` ( -- INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES +(0, '{3221,3218,0,1,0}'), (1, '{3222,3221,0,1,3}-{2804,3427,0,1,2}-{3285,3208,0,1,4}-{3093,3509,0,1,3}-{3098,3508,0,1,7}-{3096,3510,0,1,3}-{3017,3239,0,1,2}-{2712,3484,0,1,4}-{2693,3495,0,1,1}-{3237,3404,0,1,6}-{3237,3408,0,1,0}-{3247,3396,0,1,3}-{3263,3403,0,1,3}-{3210,3223,1,1,4}-{3230,3208,0,1,1}'), (2, '{3298,3185,0,1,3}-{3101,3511,0,1,4}-{2690,3489,0,1,3}-{3236,3203,0,1,4}-{3217,3209,0,1,4}-{3237,3217,0,1,6}-{3282,3503,0,1,6}'), (3, '{2818,3443,0,1,3}-{3306,3200,0,1,6}-{3300,3208,0,1,3}-{3095,3511,0,1,3}-{3094,3513,0,1,4}-{3097,3510,0,1,4}-{2699,3491,0,1,1}-{3231,3239,0,1,4}-{3278,3502,0,1,6}'), diff --git a/Server/src/plugin/dialogue/SimonTempleton.java b/Server/src/plugin/dialogue/SimonTempleton.java index 65f6d4204..2401e07cc 100644 --- a/Server/src/plugin/dialogue/SimonTempleton.java +++ b/Server/src/plugin/dialogue/SimonTempleton.java @@ -106,15 +106,15 @@ public final class SimonTempleton extends DialoguePlugin{ for(int j = 0; j < 28; j++){ switch(player.getInventory().getId(j)){ case 9032: - player.getInventory().remove(new Item(9032,j)); + player.getInventory().remove(new Item(9032),j,true); player.getInventory().add(new Item(995, 75)); break; case 9036: - player.getInventory().remove(new Item(9036,j)); + player.getInventory().remove(new Item(9036),j,true); player.getInventory().add(new Item(995, 100)); break; case 9026: - player.getInventory().remove(new Item(9026,j)); + player.getInventory().remove(new Item(9026),j,true); player.getInventory().add(new Item(995, 50)); break; } @@ -126,15 +126,15 @@ public final class SimonTempleton extends DialoguePlugin{ for(int j = 0; j < 28; j++){ switch(player.getInventory().getId(j)){ case 9042: - player.getInventory().remove(new Item(9042,j)); + player.getInventory().remove(new Item(9042),j,true); player.getInventory().add(new Item(995, 150)); break; case 9030: - player.getInventory().remove(new Item(9030,j)); + player.getInventory().remove(new Item(9030),j,true); player.getInventory().add(new Item(995, 175)); break; case 9038: - player.getInventory().remove(new Item(9038,j)); + player.getInventory().remove(new Item(9038),j,true); player.getInventory().add(new Item(995, 200)); break; } @@ -146,15 +146,15 @@ public final class SimonTempleton extends DialoguePlugin{ for(int j = 0; j < 28; j++){ switch(player.getInventory().getId(j)){ case 9040: - player.getInventory().remove(new Item(9040,j)); + player.getInventory().remove(new Item(9040),j,true); player.getInventory().add(new Item(995, 750)); break; case 9028: - player.getInventory().remove(new Item(9028,j)); + player.getInventory().remove(new Item(9028),j,true); player.getInventory().add(new Item(995, 1000)); break; case 9034: - player.getInventory().remove(new Item(9034,j)); + player.getInventory().remove(new Item(9034),j,true); player.getInventory().add(new Item(995, 1250)); break; } @@ -166,39 +166,39 @@ public final class SimonTempleton extends DialoguePlugin{ for(int j = 0; j < 28; j++){ switch(player.getInventory().getId(j)){ case 9040: - player.getInventory().remove(new Item(9040,j)); + player.getInventory().remove(new Item(9040),j,true); player.getInventory().add(new Item(995, 750)); break; case 9028: - player.getInventory().remove(new Item(9028,j)); + player.getInventory().remove(new Item(9028),j,true); player.getInventory().add(new Item(995, 1000)); break; case 9034: - player.getInventory().remove(new Item(9034,j)); + player.getInventory().remove(new Item(9034),j,true); player.getInventory().add(new Item(995, 1250)); break; case 9042: - player.getInventory().remove(new Item(9042,j)); + player.getInventory().remove(new Item(9042),j,true); player.getInventory().add(new Item(995, 150)); break; case 9030: - player.getInventory().remove(new Item(9030,j)); + player.getInventory().remove(new Item(9030),j,true); player.getInventory().add(new Item(995, 175)); break; case 9038: - player.getInventory().remove(new Item(9038,j)); + player.getInventory().remove(new Item(9038),j,true); player.getInventory().add(new Item(995, 200)); break; case 9032: - player.getInventory().remove(new Item(9032,j)); + player.getInventory().remove(new Item(9032),j,true); player.getInventory().add(new Item(995, 75)); break; case 9036: - player.getInventory().remove(new Item(9036,j)); + player.getInventory().remove(new Item(9036),j,true); player.getInventory().add(new Item(995, 100)); break; case 9026: - player.getInventory().remove(new Item(9026,j)); + player.getInventory().remove(new Item(9026),j,true); player.getInventory().add(new Item(995, 50)); break; }