Missing part of net/minecraft/world/level/dimension/end/

This commit is contained in:
Owen1212055 2024-12-14 15:32:18 -05:00
parent 12e0268dab
commit a9d7ae7213
No known key found for this signature in database
GPG Key ID: 2133292072886A30
2 changed files with 11 additions and 57 deletions

View File

@ -0,0 +1,11 @@
--- a/net/minecraft/world/level/dimension/end/DragonRespawnAnimation.java
+++ b/net/minecraft/world/level/dimension/end/DragonRespawnAnimation.java
@@ -90,7 +_,7 @@
for (EndCrystal endCrystal : crystals) {
endCrystal.setBeamTarget(null);
level.explode(endCrystal, endCrystal.getX(), endCrystal.getY(), endCrystal.getZ(), 6.0F, Level.ExplosionInteraction.NONE);
- endCrystal.discard();
+ endCrystal.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.EXPLODE); // CraftBukkit - add Bukkit remove cause
}
} else if (ticks >= 80) {
level.levelEvent(3001, new BlockPos(0, 128, 0), 0);

View File

@ -1,57 +0,0 @@
--- a/net/minecraft/world/level/dimension/end/DragonRespawnAnimation.java
+++ b/net/minecraft/world/level/dimension/end/DragonRespawnAnimation.java
@@ -12,6 +12,9 @@
import net.minecraft.world.level.levelgen.feature.Feature;
import net.minecraft.world.level.levelgen.feature.SpikeFeature;
import net.minecraft.world.level.levelgen.feature.configurations.SpikeConfiguration;
+// CraftBukkit start
+import org.bukkit.event.entity.EntityRemoveEvent;
+// CraftBukkit end
public enum DragonRespawnAnimation {
@@ -27,7 +30,7 @@
entityendercrystal.setBeamTarget(blockposition1);
}
- fight.setRespawnStage(null.PREPARING_TO_SUMMON_PILLARS);
+ fight.setRespawnStage(PREPARING_TO_SUMMON_PILLARS); // CraftBukkit - decompile error
}
},
PREPARING_TO_SUMMON_PILLARS {
@@ -38,7 +41,7 @@
world.levelEvent(3001, new BlockPos(0, 128, 0), 0);
}
} else {
- fight.setRespawnStage(null.SUMMONING_PILLARS);
+ fight.setRespawnStage(SUMMONING_PILLARS); // CraftBukkit - decompile error
}
}
@@ -81,7 +84,7 @@
Feature.END_SPIKE.place(worldgenfeatureendspikeconfiguration, world, world.getChunkSource().getGenerator(), RandomSource.create(), new BlockPos(worldgenender_spike.getCenterX(), 45, worldgenender_spike.getCenterZ()));
}
} else if (flag1) {
- fight.setRespawnStage(null.SUMMONING_DRAGON);
+ fight.setRespawnStage(SUMMONING_DRAGON); // CraftBukkit - decompile error
}
}
@@ -94,7 +97,7 @@
EndCrystal entityendercrystal;
if (tick >= 100) {
- fight.setRespawnStage(null.END);
+ fight.setRespawnStage(END); // CraftBukkit - decompile error
fight.resetSpikeCrystals();
iterator = crystals.iterator();
@@ -102,7 +105,7 @@
entityendercrystal = (EndCrystal) iterator.next();
entityendercrystal.setBeamTarget((BlockPos) null);
world.explode(entityendercrystal, entityendercrystal.getX(), entityendercrystal.getY(), entityendercrystal.getZ(), 6.0F, Level.ExplosionInteraction.NONE);
- entityendercrystal.discard();
+ entityendercrystal.discard(EntityRemoveEvent.Cause.EXPLODE); // CraftBukkit - add Bukkit remove cause
}
} else if (tick >= 80) {
world.levelEvent(3001, new BlockPos(0, 128, 0), 0);