OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-21 22:57:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make if else style consistent

Browse source
This commit is contained in:
tlm920 2024-10-24 23:34:58 -04:00
parent dc0885e7d2
commit e7eb2de726
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
patches/server/1069-Live-trial-spawner-configurations.patch
View file

@ -1,14 +1,14 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
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
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
+++ 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
public TrialSpawnerConfiguration getNormalConfiguration() {
@ -16,9 +16,8 @@ index a9882f10eb4a3b33fa9d66a3b169bb8078370f94..a7ddde1e81b6c15d1acc731a354daad9
+ // Paper start - Live trial configurations
+ if (this.isSnapshot())
+ return this.normalConfig;
+ else {
+ else
+ return new LiveTrialSpawnerConfiguration(normalConfig, LiveTrialSpawnerConfiguration.Type.NORMAL);
+ }
+ // Paper End
}
@ -28,9 +27,8 @@ index a9882f10eb4a3b33fa9d66a3b169bb8078370f94..a7ddde1e81b6c15d1acc731a354daad9
+ // Paper start - Live trial configurations
+ if (this.isSnapshot())
+ return this.ominousConfig;
+ else {
+ else
+ return new LiveTrialSpawnerConfiguration(ominousConfig, LiveTrialSpawnerConfiguration.Type.OMINOUS);
+ }
+ // Paper End
}