Mirrors/Velocity
3
0
Fork 1
Mirror von https://github.com/PaperMC/Velocity.git synchronisiert 2024-11-17 05:20:14 +01:00
Code Issues Pakete Projekte Releases Wiki Aktivität

Fix compile on JDK 8 and bad merge

Quellcode durchsuchen
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
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

1
proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
Datei anzeigen

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

7
proxy/src/main/java/com/velocitypowered/proxy/connection/registry/DimensionData.java
Datei anzeigen

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

4
proxy/src/main/java/com/velocitypowered/proxy/connection/registry/DimensionInfo.java
Datei anzeigen

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