Improved lamp xp calculation

Improved shop restrictions
Fixed bugged Cyclops room teleport

Server/src/main/content/global/handlers/item/LampPlugin.java

@@ -48,7 +48,7 @@ public final class LampPlugin extends OptionHandler {
 		} else {
 			if(player.getInventory().remove((Item) player.getAttribute("lamp"))) {
 				if (lamp == Lamps.GENIE_LAMP) {
-					player.getSkills().addExperience(skill, player.getSkills().getLevel(skill) * 10);
+					player.getSkills().addExperience(skill, player.getSkills().getStaticLevel(skill) * 10);
 				} else {
 					player.getSkills().addExperience(skill, lamp.getExp());
 				}

Server/src/main/content/region/asgarnia/burthorpe/handlers/wguild/cyclopes/CyclopesRoom.java

@@ -102,13 +102,13 @@ public final class CyclopesRoom extends MapZone implements Plugin<Object> {
 
 	@Override
 	public boolean leave(Entity e, boolean logout) {
-		if (e instanceof Player && PLAYERS.contains(e)) {
+		if (e instanceof Player) {
 			leave((Player) e);
 			PLAYERS.remove(e);
 			if (logout) {
 				e.setLocation(Location.create(2846, 3540, 2));
 			}
-			clearLogoutListener((Player) e, "cyclopes");
+		        clearLogoutListener((Player) e, "cyclopes");
 		}
 		return super.leave(e, logout);
 	}