Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
Make if else style consistent
Dieser Commit ist enthalten in:
Ursprung
dc0885e7d2
Commit
e7eb2de726
@ -1,14 +1,14 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: tlm920 <timo@timomcgrath.com>
|
From: tlm920 <timo@timomcgrath.com>
|
||||||
Date: Thu, 24 Oct 2024 23:17:58 -0400
|
Date: Thu, 24 Oct 2024 23:33:48 -0400
|
||||||
Subject: [PATCH] Live trial spawner configurations
|
Subject: [PATCH] Live trial spawner configurations
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftTrialSpawner.java b/src/main/java/org/bukkit/craftbukkit/block/CraftTrialSpawner.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftTrialSpawner.java b/src/main/java/org/bukkit/craftbukkit/block/CraftTrialSpawner.java
|
||||||
index a9882f10eb4a3b33fa9d66a3b169bb8078370f94..a7ddde1e81b6c15d1acc731a354daad9f48f1488 100644
|
index a9882f10eb4a3b33fa9d66a3b169bb8078370f94..dd08cf0fc36b8dae13bc765b5b2f42ab9a396b0f 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftTrialSpawner.java
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftTrialSpawner.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftTrialSpawner.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftTrialSpawner.java
|
||||||
@@ -139,12 +139,24 @@ public class CraftTrialSpawner extends CraftBlockEntityState<TrialSpawnerBlockEn
|
@@ -139,12 +139,22 @@ public class CraftTrialSpawner extends CraftBlockEntityState<TrialSpawnerBlockEn
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public TrialSpawnerConfiguration getNormalConfiguration() {
|
public TrialSpawnerConfiguration getNormalConfiguration() {
|
||||||
@ -16,9 +16,8 @@ index a9882f10eb4a3b33fa9d66a3b169bb8078370f94..a7ddde1e81b6c15d1acc731a354daad9
|
|||||||
+ // Paper start - Live trial configurations
|
+ // Paper start - Live trial configurations
|
||||||
+ if (this.isSnapshot())
|
+ if (this.isSnapshot())
|
||||||
+ return this.normalConfig;
|
+ return this.normalConfig;
|
||||||
+ else {
|
+ else
|
||||||
+ return new LiveTrialSpawnerConfiguration(normalConfig, LiveTrialSpawnerConfiguration.Type.NORMAL);
|
+ return new LiveTrialSpawnerConfiguration(normalConfig, LiveTrialSpawnerConfiguration.Type.NORMAL);
|
||||||
+ }
|
|
||||||
+ // Paper End
|
+ // Paper End
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -28,9 +27,8 @@ index a9882f10eb4a3b33fa9d66a3b169bb8078370f94..a7ddde1e81b6c15d1acc731a354daad9
|
|||||||
+ // Paper start - Live trial configurations
|
+ // Paper start - Live trial configurations
|
||||||
+ if (this.isSnapshot())
|
+ if (this.isSnapshot())
|
||||||
+ return this.ominousConfig;
|
+ return this.ominousConfig;
|
||||||
+ else {
|
+ else
|
||||||
+ return new LiveTrialSpawnerConfiguration(ominousConfig, LiveTrialSpawnerConfiguration.Type.OMINOUS);
|
+ return new LiveTrialSpawnerConfiguration(ominousConfig, LiveTrialSpawnerConfiguration.Type.OMINOUS);
|
||||||
+ }
|
|
||||||
+ // Paper End
|
+ // Paper End
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren