From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Martijn Muijsers Date: Mon, 26 Dec 2022 07:30:30 +0100 Subject: [PATCH] Make saving fireworks configurable License: MIT (https://opensource.org/licenses/MIT) Gale - https://galemc.org This patch is based on the following patch: "Don't save Fireworks" By: Aikar As part of: EmpireCraft (https://github.com/starlis/empirecraft) Licensed under: MIT (https://opensource.org/licenses/MIT) * EmpireCraft description * Fireworks can bug out and not detonate, and an automated launcher can very easily fill a chunk. Prevent saving Fireworks so that chunk unloads will wipe a chunks fireworks in this case. diff --git a/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java b/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java index 09d465947a5720e05c350d455c86002682104079..6c5f67138af166b87e588664b22198cbf3285c73 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java +++ b/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java @@ -358,4 +358,11 @@ public class FireworkRocketEntity extends Projectile implements ItemSupplier { return DoubleDoubleImmutablePair.of(d0, d1); } + + // Gale start - EMC - make saving fireworks configurable + @Override + public boolean shouldBeSaved() { + return this.level().galeConfig().smallOptimizations.saveFireworks; + } + // Gale end - EMC - make saving fireworks configurable } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java index 7e7e01f6514f6bbb9c89dc3c878fb6da25eb6b1f..00a327bd0e4e0f2def0bb29d5ecff4f0ec4ba1eb 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -33,6 +33,8 @@ public class GaleWorldConfiguration extends ConfigurationPart { public SmallOptimizations smallOptimizations; public class SmallOptimizations extends ConfigurationPart { + public boolean saveFireworks = true; // Gale - EMC - make saving fireworks configurable + // Gale start - Airplane - reduce projectile chunk loading public MaxProjectileChunkLoads maxProjectileChunkLoads; public class MaxProjectileChunkLoads extends ConfigurationPart {