Skip to content

Commit 60d76c8

Browse files
Dev7exDev7ex
committed
Removed the World Link function
1 parent 291e3d9 commit 60d76c8

File tree

11 files changed

+13
-326
lines changed

11 files changed

+13
-326
lines changed

‎multiworld-api/multiworld-api-bukkit/src/main/java/com/dev7ex/multiworld/api/bukkit/world/BukkitWorldHolder.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ public class BukkitWorldHolder implements WorldHolder {
3737
private boolean spawnMonsters;
3838
private boolean endPortalAccessible;
3939
private boolean netherPortalAccessible;
40-
private String endWorldName;
41-
private String netherWorldName;
42-
private String normalWorldName;
4340
private List<String> whitelist = new ArrayList<>();
4441
private boolean whitelistEnabled;
4542

‎multiworld-api/multiworld-api-core/src/main/java/com/dev7ex/multiworld/api/MultiWorldApiConfiguration.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public interface MultiWorldApiConfiguration {
2323

2424
boolean isAutoGameModeEnabled();
2525

26+
@Deprecated
2627
boolean isWorldLinkEnabled();
2728

2829
String getString(@NotNull final String path);

‎multiworld-api/multiworld-api-core/src/main/java/com/dev7ex/multiworld/api/world/WorldHolder.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,6 @@ public interface WorldHolder {
4747

4848
void setWhitelistEnabled(final boolean enabled);
4949

50-
@Nullable
51-
String getEndWorldName();
52-
53-
@Nullable
54-
String getNetherWorldName();
55-
56-
@Nullable
57-
String getNormalWorldName();
58-
5950
void updateFlag(@NotNull final WorldFlag flag, @NotNull final String value);
6051

6152
}

‎multiworld-api/multiworld-api-core/src/main/java/com/dev7ex/multiworld/api/world/WorldProperty.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
import lombok.Getter;
55
import org.jetbrains.annotations.NotNull;
66

7+
import java.util.Arrays;
8+
import java.util.Optional;
9+
710
/**
811
* @author Dev7ex
912
* @since 18.06.2023
@@ -21,9 +24,6 @@ public enum WorldProperty {
2124
SPAWN_MONSTERS("spawn-monsters", true),
2225
END_PORTAL_ACCESSIBLE("end-portal-accessible", true),
2326
NETHER_PORTAL_ACCESSIBLE("nether-portal-accessible", true),
24-
END_WORLD("end-world", true),
25-
NETHER_WORLD("nether-world", true),
26-
NORMAL_WORLD("normal-world", true),
2727
WHITELIST("whitelist", true),
2828
WHITELIST_ENABLED("whitelist-enabled", true);
2929

@@ -35,4 +35,8 @@ public enum WorldProperty {
3535
this.modifiable = modifiable;
3636
}
3737

38+
public static Optional<WorldProperty> fromStoragePath(@NotNull final String storagePath) {
39+
return Arrays.stream(WorldProperty.values()).filter(property -> property.getStoragePath().equalsIgnoreCase(storagePath)).findFirst();
40+
}
41+
3842
}

‎multiworld-bukkit/src/main/java/com/dev7ex/multiworld/command/WorldCommand.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ public WorldCommand(final MultiWorldPlugin plugin) {
3737
super.registerSubCommand(new HelpCommand(plugin));
3838
super.registerSubCommand(new ImportCommand(plugin));
3939
super.registerSubCommand(new InfoCommand(plugin));
40-
super.registerSubCommand(new LinkCommand(plugin));
4140
super.registerSubCommand(new ListCommand(plugin));
4241
super.registerSubCommand(new LoadCommand(plugin));
4342
super.registerSubCommand(new ReloadCommand(plugin));

‎multiworld-bukkit/src/main/java/com/dev7ex/multiworld/command/world/LinkCommand.java‎

Lines changed: 0 additions & 160 deletions
This file was deleted.

‎multiworld-bukkit/src/main/java/com/dev7ex/multiworld/listener/PlayerEnterPortalListener.java‎

Lines changed: 0 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
package com.dev7ex.multiworld.listener;
22

3-
import com.dev7ex.multiworld.MultiWorldPlugin;
43
import com.dev7ex.multiworld.api.bukkit.MultiWorldBukkitApi;
54
import com.dev7ex.multiworld.api.bukkit.event.MultiWorldListener;
6-
import com.dev7ex.multiworld.api.bukkit.event.user.WorldUserEnterPortalEvent;
75
import com.dev7ex.multiworld.api.bukkit.world.BukkitWorldHolder;
8-
import com.dev7ex.multiworld.api.user.WorldUser;
9-
import org.bukkit.Bukkit;
10-
import org.bukkit.PortalType;
116
import org.bukkit.entity.Player;
127
import org.bukkit.event.EventHandler;
138
import org.bukkit.event.EventPriority;
@@ -24,95 +19,6 @@ public PlayerEnterPortalListener(@NotNull final MultiWorldBukkitApi multiWorldAp
2419
super(multiWorldApi);
2520
}
2621

27-
@EventHandler(priority = EventPriority.NORMAL)
28-
public void handlePlayerPortal(final PlayerPortalEvent event) {
29-
if (!super.getConfiguration().isWorldLinkEnabled()) {
30-
return;
31-
}
32-
33-
final BukkitWorldHolder fromWorldHolder = super.getWorldProvider().getWorldHolder(event.getFrom().getWorld().getName()).orElseThrow();
34-
final Player player = event.getPlayer();
35-
final WorldUser user = super.getUserProvider().getUser(player.getUniqueId()).orElseThrow();
36-
37-
if (event.getTo() == null) {
38-
return;
39-
}
40-
41-
if (event.getTo().getWorld() == null) {
42-
return;
43-
}
44-
45-
switch (event.getTo().getWorld().getEnvironment()) {
46-
case NETHER:
47-
if (fromWorldHolder.getNetherWorldName() == null) {
48-
MultiWorldPlugin.getInstance().getLogger().warning("Player: " + player.getName() + " try to enter the nether-world of " + fromWorldHolder.getName() + " but is null!");
49-
event.setCancelled(true);
50-
return;
51-
}
52-
53-
if (super.getWorldProvider().getWorldHolder(fromWorldHolder.getNetherWorldName()).isEmpty()) {
54-
MultiWorldPlugin.getInstance().getLogger().warning("Player: " + player.getName() + " try to enter the nether-world of " + fromWorldHolder.getName() + " but the world not exists!");
55-
event.setCancelled(true);
56-
return;
57-
}
58-
final BukkitWorldHolder netherWorldHolder = super.getWorldProvider().getWorldHolder(fromWorldHolder.getNetherWorldName()).get();
59-
60-
if (!netherWorldHolder.isLoaded()) {
61-
MultiWorldPlugin.getInstance().getLogger().warning("Player: " + player.getName() + " try to enter the nether-world of " + fromWorldHolder.getName() + " but the world is not loaded!");
62-
event.setCancelled(true);
63-
return;
64-
}
65-
Bukkit.getPluginManager().callEvent(new WorldUserEnterPortalEvent(user, fromWorldHolder, netherWorldHolder, PortalType.NETHER));
66-
event.setTo(netherWorldHolder.getWorld().getSpawnLocation());
67-
break;
68-
69-
case NORMAL:
70-
if (fromWorldHolder.getNormalWorldName() == null) {
71-
MultiWorldPlugin.getInstance().getLogger().warning("Player: " + player.getName() + " try to enter the normal-world of " + fromWorldHolder.getName() + " but is null!");
72-
event.setCancelled(true);
73-
event.setCancelled(true);
74-
}
75-
76-
if (super.getWorldProvider().getWorldHolder(fromWorldHolder.getNormalWorldName()).isEmpty()) {
77-
MultiWorldPlugin.getInstance().getLogger().warning("Player: " + player.getName() + " try to enter the normal-world of " + fromWorldHolder.getName() + " but the world not exists!");
78-
event.setCancelled(true);
79-
return;
80-
}
81-
final BukkitWorldHolder normalWorldHolder = super.getWorldProvider().getWorldHolder(fromWorldHolder.getNormalWorldName()).get();
82-
83-
if (!normalWorldHolder.isLoaded()) {
84-
MultiWorldPlugin.getInstance().getLogger().warning("Player: " + player.getName() + " try to enter the normal-world of " + fromWorldHolder.getName() + " but the world is not loaded!");
85-
event.setCancelled(true);
86-
return;
87-
}
88-
Bukkit.getPluginManager().callEvent(new WorldUserEnterPortalEvent(user, fromWorldHolder, normalWorldHolder, PortalType.CUSTOM));
89-
event.setTo(normalWorldHolder.getWorld().getSpawnLocation());
90-
break;
91-
92-
case THE_END:
93-
if (fromWorldHolder.getEndWorldName() == null) {
94-
MultiWorldPlugin.getInstance().getLogger().warning("Player: " + player.getName() + " try to enter the end-world of " + fromWorldHolder.getName() + " but is null!");
95-
event.setCancelled(true);
96-
}
97-
98-
if (super.getWorldProvider().getWorldHolder(fromWorldHolder.getEndWorldName()).isEmpty()) {
99-
MultiWorldPlugin.getInstance().getLogger().warning("Player: " + player.getName() + " try to enter the end-world of " + fromWorldHolder.getName() + " but the world not exists!");
100-
event.setCancelled(true);
101-
return;
102-
}
103-
final BukkitWorldHolder endWorldHolder = super.getWorldProvider().getWorldHolder(fromWorldHolder.getEndWorldName()).get();
104-
105-
if (!endWorldHolder.isLoaded()) {
106-
MultiWorldPlugin.getInstance().getLogger().warning("Player: " + player.getName() + " try to enter the end-world of " + fromWorldHolder.getName() + " but the world is not loaded!");
107-
event.setCancelled(true);
108-
return;
109-
}
110-
Bukkit.getPluginManager().callEvent(new WorldUserEnterPortalEvent(user, fromWorldHolder, endWorldHolder, PortalType.ENDER));
111-
event.setTo(endWorldHolder.getWorld().getSpawnLocation());
112-
break;
113-
}
114-
}
115-
11622
@EventHandler(priority = EventPriority.NORMAL)
11723
public void handlePlayerEnterBlockPortal(final PlayerPortalEvent event) {
11824
final BukkitWorldHolder fromWorldHolder = super.getWorldProvider().getWorldHolder(event.getFrom().getWorld().getName()).orElseThrow();

0 commit comments

Comments
 (0)