Upstream/WorldSystem
1
0
Fork 0
mirror of https://github.com/trainerlord/WorldSystem.git synced 2025-01-05 18:37:48 +01:00
Code Issues Projects Releases Wiki Activity

Takeing fixes from @Astroreen

Browse Source
This commit is contained in:
CrazyCloudCraft | Argantiu 2022-07-15 13:08:46 +02:00 committed by GitHub
parent 923bfbf16d
commit c06ea53876
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/de/butzlabben/world/util/PapiExtension.java
View File

@ -10,7 +10,10 @@ import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
public class PapiExtension extends PlaceholderExpansion {
@ -18,26 +21,45 @@ public class PapiExtension extends PlaceholderExpansion {
private final WorldSystem worldSystem = WorldSystem.getInstance();
@Override
public String getIdentifier() {
public @NotNull String getIdentifier() {
return "worldsystem";
}
@Override
public String getAuthor() {
public @NotNull String getAuthor() {
return "Butzlabben";
}
@Override
public String getVersion() {
public @NotNull String getVersion() {
return worldSystem.getDescription().getVersion();
}
@Override
public String onRequest(OfflinePlayer p, String params) {
DependenceConfig config = new DependenceConfig(p);
String[] args = params.split("_");
if (args.length == 3 && args[0].equalsIgnoreCase("world")
&& args[1].equalsIgnoreCase("member")){
Player playerOnline = p.getPlayer();
if(playerOnline == null) return "none";
WorldConfig wc = WorldConfig.getWorldConfig(playerOnline.getWorld().getName());
List<String> members = new ArrayList<>(wc.getMembersWithNames().values());
int member;
try {
member = Integer.parseInt(args[2]);
} catch (NumberFormatException e){
throw new IllegalArgumentException("No placeholder named\"" + getIdentifier() + "_" + params + "\" is known");
}
return members.get(member);
}
switch (params) {
case "has_world":
return new DependenceConfig(p).hasWorld() + "";
// @@ -48,16 +69,16 @@ public String onRequest(OfflinePlayer p, String params) {
case "is_creator":
WorldPlayer player = new WorldPlayer(Objects.requireNonNull(Bukkit.getPlayer(p.getUniqueId())));
if (!player.isOnSystemWorld())
@ -48,16 +70,16 @@ public class PapiExtension extends PlaceholderExpansion {
return "none";
else
return config.getWorldname();
case "world_of_player_loaded":
case "world_loaded":
if (!config.hasWorld())
return "none";
return SystemWorld.getSystemWorld(config.getWorldname()).isLoaded() + "";
return Objects.requireNonNull(SystemWorld.getSystemWorld(config.getWorldname()).isLoaded() + "";
case "pretty_world_name":
if (!p.isOnline()) {
if (!config.hasWorld()) {
Player p1 = p.getPlayer();
if (p1 != null && p1.isOnline())
return p1.getLocation().getWorld().getName();
return Objects.requireNonNull(p1.getLocation().getWorld().getName();
return "none";
}
return config.getOwner().getName();