Updated to Java 17.
This commit is contained in:
		| @@ -120,7 +120,8 @@ public class WyvernManager extends AbstractNpcAI | ||||
| 	 | ||||
| 	private boolean isOwnerClan(Npc npc, PlayerInstance player) | ||||
| 	{ | ||||
| 		switch (MANAGERS.get(npc.getId())) | ||||
| 		final ManagerType type = MANAGERS.get(npc.getId()); | ||||
| 		switch (type) | ||||
| 		{ | ||||
| 			case CASTLE: | ||||
| 			{ | ||||
| @@ -156,7 +157,8 @@ public class WyvernManager extends AbstractNpcAI | ||||
| 	 | ||||
| 	private boolean isInSiege(Npc npc) | ||||
| 	{ | ||||
| 		switch (MANAGERS.get(npc.getId())) | ||||
| 		final ManagerType type = MANAGERS.get(npc.getId()); | ||||
| 		switch (type) | ||||
| 		{ | ||||
| 			case CASTLE: | ||||
| 			{ | ||||
| @@ -175,7 +177,8 @@ public class WyvernManager extends AbstractNpcAI | ||||
| 	 | ||||
| 	private String getResidenceName(Npc npc) | ||||
| 	{ | ||||
| 		switch (MANAGERS.get(npc.getId())) | ||||
| 		final ManagerType type = MANAGERS.get(npc.getId()); | ||||
| 		switch (type) | ||||
| 		{ | ||||
| 			case CASTLE: | ||||
| 			{ | ||||
| @@ -222,19 +225,24 @@ public class WyvernManager extends AbstractNpcAI | ||||
| 				{ | ||||
| 					htmltext = replaceAll(npc, player); | ||||
| 				} | ||||
| 				else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE) | ||||
| 				{ | ||||
| 					htmltext = "wyvernmanager-dusk.html"; | ||||
| 				} | ||||
| 				else | ||||
| 				{ | ||||
| 					htmltext = replaceAll(npc, player); | ||||
| 					final ManagerType type = MANAGERS.get(npc.getId()); | ||||
| 					if (type == ManagerType.CASTLE) | ||||
| 					{ | ||||
| 						htmltext = "wyvernmanager-dusk.html"; | ||||
| 					} | ||||
| 					else | ||||
| 					{ | ||||
| 						htmltext = replaceAll(npc, player); | ||||
| 					} | ||||
| 				} | ||||
| 				break; | ||||
| 			} | ||||
| 			case "Help": | ||||
| 			{ | ||||
| 				htmltext = MANAGERS.get(npc.getId()) == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html"); | ||||
| 				final ManagerType type = MANAGERS.get(npc.getId()); | ||||
| 				htmltext = type == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html"); | ||||
| 				break; | ||||
| 			} | ||||
| 			case "RideWyvern": | ||||
| @@ -246,7 +254,8 @@ public class WyvernManager extends AbstractNpcAI | ||||
| 						player.sendMessage("You cannot summon wyvern while in siege."); | ||||
| 						return null; | ||||
| 					} | ||||
| 					if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE) | ||||
| 					final ManagerType type = MANAGERS.get(npc.getId()); | ||||
| 					if (type == ManagerType.CASTLE) | ||||
| 					{ | ||||
| 						htmltext = "wyvernmanager-dusk.html"; | ||||
| 					} | ||||
| @@ -277,13 +286,17 @@ public class WyvernManager extends AbstractNpcAI | ||||
| 		{ | ||||
| 			htmltext = replaceAll(npc, player); | ||||
| 		} | ||||
| 		else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE) | ||||
| 		{ | ||||
| 			htmltext = "wyvernmanager-dusk.html"; | ||||
| 		} | ||||
| 		else | ||||
| 		{ | ||||
| 			htmltext = replaceAll(npc, player); | ||||
| 			final ManagerType type = MANAGERS.get(npc.getId()); | ||||
| 			if (type == ManagerType.CASTLE) | ||||
| 			{ | ||||
| 				htmltext = "wyvernmanager-dusk.html"; | ||||
| 			} | ||||
| 			else | ||||
| 			{ | ||||
| 				htmltext = replaceAll(npc, player); | ||||
| 			} | ||||
| 		} | ||||
| 		return htmltext; | ||||
| 	} | ||||
|   | ||||
| @@ -35,7 +35,8 @@ public class OpBlinkSkillCondition implements ISkillCondition | ||||
| 	 | ||||
| 	public OpBlinkSkillCondition(StatSet params) | ||||
| 	{ | ||||
| 		switch (params.getEnum("direction", Position.class)) | ||||
| 		final Position position = params.getEnum("direction", Position.class); | ||||
| 		switch (position) | ||||
| 		{ | ||||
| 			case BACK: | ||||
| 			{ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 MobiusDevelopment
					MobiusDevelopment