Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-03-02 11:21:15 +01:00
Code Issues Projects Releases Wiki Activity

Minor Property Tweaks (#1591)

Browse Source 
* Add System Property for changing Portal Teleport boundry, remove unnecessary PropertyUtils method

* Remove unneeded imports on changed files

* Restore getString in PropertyUtils, change to use JDK method
This commit is contained in:
GreatWyrm 2022-12-30 21:52:16 -05:00 committed by GitHub
parent c04028336d
commit 9890d71347
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/minestom/server/extensions/ExtensionManager.java
View File

@ -5,7 +5,6 @@ import net.minestom.dependencies.DependencyGetter;
import net.minestom.dependencies.ResolvedDependency; import net.minestom.dependencies.ResolvedDependency;
import net.minestom.dependencies.maven.MavenRepository; import net.minestom.dependencies.maven.MavenRepository;
import net.minestom.server.ServerProcess; import net.minestom.server.ServerProcess;
import net.minestom.server.utils.PropertyUtils;
import net.minestom.server.utils.validate.Check; import net.minestom.server.utils.validate.Check;
import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -37,7 +36,7 @@ public class ExtensionManager {
private final Map<String, Extension> extensions = new LinkedHashMap<>(); private final Map<String, Extension> extensions = new LinkedHashMap<>();
private final Map<String, Extension> immutableExtensions = Collections.unmodifiableMap(extensions); private final Map<String, Extension> immutableExtensions = Collections.unmodifiableMap(extensions);
private final File extensionFolder = new File(PropertyUtils.getString("minestom.extension.folder", "extensions")); private final File extensionFolder = new File(System.getProperty("minestom.extension.folder", "extensions"));
private final File dependenciesFolder = new File(extensionFolder, ".libs"); private final File dependenciesFolder = new File(extensionFolder, ".libs");
private Path extensionDataRoot = extensionFolder.toPath(); private Path extensionDataRoot = extensionFolder.toPath();

5
src/main/java/net/minestom/server/instance/WorldBorder.java
View File

@ -27,7 +27,7 @@ public class WorldBorder {
private long lerpStartTime; private long lerpStartTime;
private long speed; private long speed;
private int portalTeleportBoundary; private final int portalTeleportBoundary;
private int warningTime; private int warningTime;
private int warningBlocks; private int warningBlocks;
@ -39,8 +39,7 @@ public class WorldBorder {
this.speed = 0; this.speed = 0;
this.portalTeleportBoundary = 29999984; this.portalTeleportBoundary = Integer.getInteger("minestom.world-border-size", 29999984);
} }
/** /**

8
src/main/java/net/minestom/server/utils/PropertyUtils.java
View File

@ -21,12 +21,6 @@ public final class PropertyUtils {
@Contract("_, null -> null; _, !null -> !null") @Contract("_, null -> null; _, !null -> !null")
public static String getString(@NotNull String name, @Nullable String defaultValue) { public static String getString(@NotNull String name, @Nullable String defaultValue) {
final String value = System.getProperty(name); return System.getProperty(name, defaultValue);
if (value == null) {
return defaultValue;
} else {
return value;
}
} }
} }