FancyInnovations/FancyPlugins
1
0
Fork 0
mirror of https://github.com/FancyInnovations/FancyPlugins.git synced 2025-12-06 07:43:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fancynpcs: Use copied view in npc manager

Browse Source
This commit is contained in:
Oliver
2025-09-23 20:27:07 +02:00
parent 7179c6109e
commit 90a1be3750
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/NpcManagerImpl.java
View File

@@ -52,7 +52,7 @@ public class NpcManagerImpl implements NpcManager {
} }
public void registerNpc(Npc npc) { public void registerNpc(Npc npc) {
if (!FancyNpcs.PLAYER_NPCS_FEATURE_FLAG.isEnabled() && npcs.values().stream().anyMatch(npc1 -> npc1.getData().getName().equals(npc.getData().getName()))) { if (!FancyNpcs.PLAYER_NPCS_FEATURE_FLAG.isEnabled() && getAllNpcs().stream().anyMatch(npc1 -> npc1.getData().getName().equals(npc.getData().getName()))) {
throw new IllegalStateException("An NPC with this name already exists"); throw new IllegalStateException("An NPC with this name already exists");
} else { } else {
npcs.put(npc.getData().getId(), npc); npcs.put(npc.getData().getId(), npc);
@@ -74,7 +74,7 @@ public class NpcManagerImpl implements NpcManager {
@ApiStatus.Internal @ApiStatus.Internal
@Override @Override
public Npc getNpc(int entityId) { public Npc getNpc(int entityId) {
for (Npc npc : npcs.values()) { for (Npc npc : getAllNpcs()) {
if (npc.getEntityId() == entityId) { if (npc.getEntityId() == entityId) {
return npc; return npc;
} }
@@ -85,7 +85,7 @@ public class NpcManagerImpl implements NpcManager {
@Override @Override
public Npc getNpc(String name) { public Npc getNpc(String name) {
for (Npc npc : npcs.values()) { for (Npc npc : getAllNpcs()) {
if (npc.getData().getName().equalsIgnoreCase(name)) { if (npc.getData().getName().equalsIgnoreCase(name)) {
return npc; return npc;
} }
@@ -96,7 +96,7 @@ public class NpcManagerImpl implements NpcManager {
@Override @Override
public Npc getNpcById(String id) { public Npc getNpcById(String id) {
for (Npc npc : npcs.values()) { for (Npc npc : getAllNpcs()) {
if (npc.getData().getId().equals(id)) { if (npc.getData().getId().equals(id)) {
return npc; return npc;
} }
@@ -107,7 +107,7 @@ public class NpcManagerImpl implements NpcManager {
@Override @Override
public Npc getNpc(String name, UUID creator) { public Npc getNpc(String name, UUID creator) {
for (Npc npc : npcs.values()) { for (Npc npc : getAllNpcs()) {
if (npc.getData().getCreator().equals(creator) && npc.getData().getName().equalsIgnoreCase(name)) { if (npc.getData().getCreator().equals(creator) && npc.getData().getName().equalsIgnoreCase(name)) {
return npc; return npc;
} }
@@ -117,7 +117,7 @@ public class NpcManagerImpl implements NpcManager {
} }
public Collection<Npc> getAllNpcs() { public Collection<Npc> getAllNpcs() {
return npcs.values(); return new ArrayList<>(npcs.values());
} }
public void saveNpcs(boolean force) { public void saveNpcs(boolean force) {
@@ -136,7 +136,7 @@ public class NpcManagerImpl implements NpcManager {
YamlConfiguration npcConfig = YamlConfiguration.loadConfiguration(npcConfigFile); YamlConfiguration npcConfig = YamlConfiguration.loadConfiguration(npcConfigFile);
for (Npc npc : npcs.values()) { for (Npc npc : getAllNpcs()) {
if (!npc.isSaveToFile()) { if (!npc.isSaveToFile()) {
continue; continue;
} }