3
0
Mirror von https://github.com/PaperMC/Velocity.git synchronisiert 2024-12-24 15:20:35 +01:00

Fix compile on JDK 8 and bad merge

Dieser Commit ist enthalten in:
Andrew Steinborn 2020-06-21 13:38:05 -04:00
Ursprung 09f71dede9
Commit d1a5d8dd82
3 geänderte Dateien mit 5 neuen und 7 gelöschten Zeilen

Datei anzeigen

@ -299,7 +299,6 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
if (!spawned) {
// Nothing special to do with regards to spawning the player
spawned = true;
player.getConnection().delayedWrite(joinGame);
destination.setActiveDimensionRegistry(joinGame.getDimensionRegistry()); // 1.16
player.getConnection().delayedWrite(joinGame);

Datei anzeigen

@ -48,14 +48,13 @@ public final class DimensionData {
@Nullable Long fixedTime, @Nullable Boolean createDragonFight) {
Preconditions.checkNotNull(
registryIdentifier, "registryIdentifier cannot be null");
Preconditions.checkArgument(registryIdentifier.length() > 0 && !registryIdentifier.isBlank(),
Preconditions.checkArgument(registryIdentifier.length() > 0,
"registryIdentifier cannot be empty");
Preconditions.checkArgument(logicalHeight >= 0, "localHeight must be >= 0");
Preconditions.checkNotNull(
burningBehaviourIdentifier, "burningBehaviourIdentifier cannot be null");
Preconditions.checkArgument(burningBehaviourIdentifier.length() > 0
&& !burningBehaviourIdentifier.isBlank(),
"burningBehaviourIdentifier cannot be empty");
Preconditions.checkArgument(burningBehaviourIdentifier.length() > 0,
"burningBehaviourIdentifier cannot be empty");
this.registryIdentifier = registryIdentifier;
this.isNatural = isNatural;
this.ambientLight = ambientLight;

Datei anzeigen

@ -21,12 +21,12 @@ public final class DimensionInfo {
this.registryIdentifier = Preconditions.checkNotNull(
registryIdentifier, "registryIdentifier cannot be null");
Preconditions.checkArgument(
registryIdentifier.length() > 0 && !registryIdentifier.isBlank(),
registryIdentifier.length() > 0,
"registryIdentifier cannot be empty");
this.levelName = Preconditions.checkNotNull(
levelName, "levelName cannot be null");
Preconditions.checkArgument(
levelName.length() > 0 && !levelName.isBlank(),
levelName.length() > 0,
"registryIdentifier cannot be empty");
this.isFlat = isFlat;
this.isDebugType = isDebugType;