From f5134da09ef772a87d6113b9fecd60f845bd395a Mon Sep 17 00:00:00 2001
From: Warrior <50800980+Warriorrrr@users.noreply.github.com>
Date: Mon, 17 Nov 2025 10:05:45 +0100
Subject: [PATCH] Do not save entity fire override if it's unset

---
 .../sources/net/minecraft/world/entity/Entity.java.patch | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/paper-server/patches/sources/net/minecraft/world/entity/Entity.java.patch b/paper-server/patches/sources/net/minecraft/world/entity/Entity.java.patch
index f4ed7d2fec50..54f61f1374c5 100644
--- a/paper-server/patches/sources/net/minecraft/world/entity/Entity.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/Entity.java.patch
@@ -760,17 +760,20 @@
              output.storeNullable("CustomName", ComponentSerialization.CODEC, this.getCustomName());
              if (this.isCustomNameVisible()) {
                  output.putBoolean("CustomNameVisible", this.isCustomNameVisible());
-@@ -1976,9 +_,12 @@
+@@ -1976,9 +_,14 @@
                  output.putInt("TicksFrozen", this.getTicksFrozen());
              }
  
 -            if (this.hasVisualFire) {
 -                output.putBoolean("HasVisualFire", this.hasVisualFire);
+-            }
 +            // Paper start - improve visual fire API
 +            if (this.visualFire.equals(net.kyori.adventure.util.TriState.TRUE)) {
 +                output.putBoolean("HasVisualFire", true);
-             }
-+            output.putString("Paper.FireOverride", visualFire.name());
++            }
++            if (this.visualFire != net.kyori.adventure.util.TriState.NOT_SET) {
++                output.putString("Paper.FireOverride", visualFire.name());
++            }
 +            // Paper end
  
              if (!this.tags.isEmpty()) {