From 4198f9a83660a516d797e123600e606733d63268 Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Thu, 27 May 2021 14:52:30 -0700
Subject: [PATCH] Fix invulnerable end crystals

MC-108513
---
 .../boss/enderdragon/EndCrystal.java.patch    | 41 +++++++++++++++++--
 .../levelgen/feature/SpikeFeature.java.patch  | 10 +++++
 2 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 paper-server/patches/sources/net/minecraft/world/level/levelgen/feature/SpikeFeature.java.patch

diff --git a/paper-server/patches/sources/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java.patch b/paper-server/patches/sources/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java.patch
index bbf50c3986..9f6803d4ee 100644
--- a/paper-server/patches/sources/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
 +++ b/net/minecraft/world/entity/boss/enderdragon/EndCrystal.java
-@@ -19,6 +19,11 @@
+@@ -19,12 +19,18 @@
  import net.minecraft.world.level.Level;
  import net.minecraft.world.level.block.BaseFireBlock;
  import net.minecraft.world.level.dimension.end.EndDragonFight;
@@ -12,7 +12,14 @@
  
  public class EndCrystal extends Entity {
  
-@@ -57,7 +62,11 @@
+     private static final EntityDataAccessor<Optional<BlockPos>> DATA_BEAM_TARGET = SynchedEntityData.defineId(EndCrystal.class, EntityDataSerializers.OPTIONAL_BLOCK_POS);
+     private static final EntityDataAccessor<Boolean> DATA_SHOW_BOTTOM = SynchedEntityData.defineId(EndCrystal.class, EntityDataSerializers.BOOLEAN);
+     public int time;
++    public boolean generatedByDragonFight = false; // Paper - Fix invulnerable end crystals
+ 
+     public EndCrystal(EntityType<? extends EndCrystal> type, Level world) {
+         super(type, world);
+@@ -57,8 +63,23 @@
              BlockPos blockposition = this.blockPosition();
  
              if (((ServerLevel) this.level()).getDragonFight() != null && this.level().getBlockState(blockposition).isAir()) {
@@ -23,9 +30,37 @@
 +                }
 +                // CraftBukkit end
              }
++            // Paper start - Fix invulnerable end crystals
++            if (this.level().paperConfig().unsupportedSettings.fixInvulnerableEndCrystalExploit && this.generatedByDragonFight && this.isInvulnerable()) {
++                if (!java.util.Objects.equals(((ServerLevel) this.level()).uuid, this.getOriginWorld())
++                    || ((ServerLevel) this.level()).getDragonFight() == null
++                    || ((ServerLevel) this.level()).getDragonFight().respawnStage == null
++                    || ((ServerLevel) this.level()).getDragonFight().respawnStage.ordinal() > net.minecraft.world.level.dimension.end.DragonRespawnAnimation.SUMMONING_DRAGON.ordinal()) {
++                    this.setInvulnerable(false);
++                    this.setBeamTarget(null);
++                }
++            }
++            // Paper end - Fix invulnerable end crystals
          }
  
-@@ -99,12 +108,26 @@
+     }
+@@ -70,6 +91,7 @@
+         }
+ 
+         nbt.putBoolean("ShowBottom", this.showsBottom());
++        if (this.generatedByDragonFight) nbt.putBoolean("Paper.GeneratedByDragonFight", this.generatedByDragonFight); // Paper - Fix invulnerable end crystals
+     }
+ 
+     @Override
+@@ -78,6 +100,7 @@
+         if (nbt.contains("ShowBottom", 1)) {
+             this.setShowBottom(nbt.getBoolean("ShowBottom"));
+         }
++        if (nbt.contains("Paper.GeneratedByDragonFight", 1)) this.generatedByDragonFight = nbt.getBoolean("Paper.GeneratedByDragonFight"); // Paper - Fix invulnerable end crystals
+ 
+     }
+ 
+@@ -99,12 +122,26 @@
              return false;
          } else {
              if (!this.isRemoved()) {
diff --git a/paper-server/patches/sources/net/minecraft/world/level/levelgen/feature/SpikeFeature.java.patch b/paper-server/patches/sources/net/minecraft/world/level/levelgen/feature/SpikeFeature.java.patch
new file mode 100644
index 0000000000..3db119d7ed
--- /dev/null
+++ b/paper-server/patches/sources/net/minecraft/world/level/levelgen/feature/SpikeFeature.java.patch
@@ -0,0 +1,10 @@
+--- a/net/minecraft/world/level/levelgen/feature/SpikeFeature.java
++++ b/net/minecraft/world/level/levelgen/feature/SpikeFeature.java
+@@ -115,6 +115,7 @@
+             endCrystal.moveTo(
+                 (double)spike.getCenterX() + 0.5, (double)(spike.getHeight() + 1), (double)spike.getCenterZ() + 0.5, random.nextFloat() * 360.0F, 0.0F
+             );
++            endCrystal.generatedByDragonFight = true; // Paper - Fix invulnerable end crystals
+             world.addFreshEntity(endCrystal);
+             BlockPos blockPos2 = endCrystal.blockPosition();
+             this.setBlock(world, blockPos2.below(), Blocks.BEDROCK.defaultBlockState());