make Phantom#anchorPoint nullable

Author: Lulu13022002

paper-api/src/main/java/org/bukkit/entity/Phantom.java

@@ -1,7 +1,8 @@
 package org.bukkit.entity;
 
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.Location;
 import org.jetbrains.annotations.Nullable;
+import java.util.UUID;
 
 /**
  * Represents a phantom.
@@ -14,18 +15,17 @@ public interface Phantom extends Flying, Enemy {
     public int getSize();
 
     /**
-     * @param sz The new size of the phantom.
+     * @param size The new size of the phantom.
      */
-    public void setSize(int sz);
+    public void setSize(int size);
 
-    // Paper start
     /**
      * Get the UUID of the entity that caused this phantom to spawn
      *
      * @return UUID
      */
     @Nullable
-    public java.util.UUID getSpawningEntity();
+    public UUID getSpawningEntity();
 
     /**
      * Check if this phantom will burn in the sunlight
@@ -47,14 +47,13 @@ public interface Phantom extends Flying, Enemy {
      *
      * @return circling location
      */
-    @org.jetbrains.annotations.NotNull
-    org.bukkit.Location getAnchorLocation();
+    @Nullable
+    Location getAnchorLocation();
 
     /**
      * Sets the location that this phantom circles around when not attacking a player
      *
      * @param location circling location (world is ignored, will always use the entity's world)
      */
-    void setAnchorLocation(@org.jetbrains.annotations.NotNull org.bukkit.Location location);
-    // Paper end
+    void setAnchorLocation(@Nullable Location location);
 }

paper-server/patches/sources/net/minecraft/server/level/ServerLevel.java.patch

@@ -1051,7 +1051,7 @@
 +    }
 +    // Paper end - respect global sound events gamerule
 +    // Paper start - notify observers even if grow failed
-+    @Deprecated // todo check if needed
++    @Deprecated
 +    public void checkCapturedTreeStateForObserverNotify(final BlockPos pos, final org.bukkit.craftbukkit.block.CraftBlockState craftBlockState) {
 +        // notify observers if the block state is the same and the Y level equals the original y level (for mega trees)
 +        // blocks at the same Y level with the same state can be assumed to be saplings which trigger observers regardless of if the

paper-server/patches/sources/net/minecraft/world/entity/Entity.java.patch

@@ -406,15 +406,22 @@
              this.onBelowWorld();
          }
      }
-@@ -533,14 +_,34 @@
+@@ -532,15 +_,41 @@
+     }
 
      public void lavaIgnite() {
++        // Paper start - track lava contact
++        this.lavaIgnite(this.lastLavaContact); // fallback for minecarts if defined
++    }
++
++    public void lavaIgnite(@Nullable BlockPos pos) {
++        // Paper end - track lava contact
          if (!this.fireImmune()) {
 -            this.igniteForSeconds(15.0F);
 +            // CraftBukkit start - Fallen in lava TODO: this event spams!
 +            if (this instanceof net.minecraft.world.entity.LivingEntity && this.remainingFireTicks <= 0) {
 +                // not on fire yet
-+                org.bukkit.block.Block damager = (this.lastLavaContact == null) ? null : org.bukkit.craftbukkit.block.CraftBlock.at(this.level, this.lastLavaContact);
++                org.bukkit.block.Block damager = pos == null ? null : org.bukkit.craftbukkit.block.CraftBlock.at(this.level, pos);
 +                org.bukkit.entity.Entity damagee = this.getBukkitEntity();
 +                org.bukkit.event.entity.EntityCombustEvent combustEvent = new org.bukkit.event.entity.EntityCombustByBlockEvent(damager, damagee, 15.0F);
 +

paper-server/patches/sources/net/minecraft/world/entity/InsideBlockEffectType.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/InsideBlockEffectType.java
 +++ b/net/minecraft/world/entity/InsideBlockEffectType.java
-@@ -6,7 +_,7 @@
+@@ -6,21 +_,34 @@
  public enum InsideBlockEffectType {
      FREEZE(entity -> {
          entity.setIsInPowderSnow(true);
@@ -9,8 +9,9 @@
              entity.setTicksFrozen(Math.min(entity.getTicksRequiredToFreeze(), entity.getTicksFrozen() + 1));
          }
      }),
-@@ -14,13 +_,26 @@
-     LAVA_IGNITE(Entity::lavaIgnite),
+     FIRE_IGNITE(BaseFireBlock::fireIgnite),
+-    LAVA_IGNITE(Entity::lavaIgnite),
++    LAVA_IGNITE((entity, pos) -> entity.lavaIgnite(pos)), // Paper - track lava contact
      EXTINGUISH(Entity::clearFire);
 
 -    private final Consumer<Entity> effect;

paper-server/patches/sources/net/minecraft/world/level/block/LavaCauldronBlock.java.patch

@@ -6,8 +6,9 @@
      protected void entityInside(BlockState state, Level level, BlockPos pos, Entity entity, InsideBlockEffectApplier effectApplier) {
 +        if (!new io.papermc.paper.event.entity.EntityInsideBlockEvent(entity.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(level, pos)).callEvent()) { return; } // Paper - Add EntityInsideBlockEvent
          if (this.isEntityInsideContent(state, pos, entity)) {
-             entity.lavaIgnite();
+-            entity.lavaIgnite();
 -            entity.lavaHurt();
++            entity.lavaIgnite(pos); // Paper - track lava contact
 +            entity.lavaHurt(pos); // Paper - track lava contact
          }
      }

paper-server/patches/sources/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java.patch

@@ -152,7 +152,7 @@
                  this.dirtyDecorations = false;
 -                collection = MapItemSavedData.this.decorations.values();
 +                // CraftBukkit start
-+                java.util.Collection<MapDecoration> icons = new java.util.ArrayList<MapDecoration>();
++                Collection<MapDecoration> icons = new java.util.ArrayList<>();
 +                if (vanillaMaps) this.addSeenPlayers(icons); // Paper
 +
 +                for (org.bukkit.map.MapCursor cursor : render.cursors) {

paper-server/src/main/java/org/bukkit/craftbukkit/CraftRaid.java

@@ -17,9 +17,11 @@
 public final class CraftRaid implements Raid {
 
     private final net.minecraft.world.entity.raid.Raid handle;
+    private final Level level;
 
-    public CraftRaid(net.minecraft.world.entity.raid.Raid handle) {
+    public CraftRaid(net.minecraft.world.entity.raid.Raid handle, Level level) {
         this.handle = handle;
+        this.level = level;
     }
 
     @Override
@@ -47,8 +49,7 @@ public void setBadOmenLevel(int badOmenLevel) {
     @Override
     public Location getLocation() {
         BlockPos pos = this.handle.getCenter();
-        Level world = this.handle.getLevel();
-        return CraftLocation.toBukkit(pos, world.getWorld());
+        return CraftLocation.toBukkit(pos, this.level.getWorld());
     }
 
     @Override

paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java

@@ -1953,11 +1953,11 @@ public CraftMapView getMap(int id) {
     public CraftMapView createMap(World world) {
         Preconditions.checkArgument(world != null, "World cannot be null");
 
-        net.minecraft.world.level.Level minecraftWorld = ((CraftWorld) world).getHandle();
+        ServerLevel level = ((CraftWorld) world).getHandle();
         // creates a new map at world spawn with the scale of 3, without tracking position and unlimited tracking
-        BlockPos spawn = minecraftWorld.getLevelData().getSpawnPos();
-        MapId newId = MapItem.createNewSavedData(minecraftWorld, spawn.getX(), spawn.getZ(), 3, false, false, minecraftWorld.dimension());
-        return minecraftWorld.getMapData(newId).mapView;
+        BlockPos spawn = level.getLevelData().getSpawnPos();
+        MapId newId = MapItem.createNewSavedData(level, spawn.getX(), spawn.getZ(), 3, false, false, level.dimension());
+        return level.getMapData(newId).mapView;
     }
 
     @Override

paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java

@@ -2325,21 +2325,21 @@ public Raid locateNearestRaid(Location location, int radius) {
 
         Raids persistentRaid = this.world.getRaids();
         net.minecraft.world.entity.raid.Raid raid = persistentRaid.getNearbyRaid(CraftLocation.toBlockPosition(location), radius * radius);
-        return (raid == null) ? null : new CraftRaid(raid);
+        return (raid == null) ? null : new CraftRaid(raid, this.world);
     }
 
     // Paper start - more Raid API
     @Override
     public @Nullable Raid getRaid(final int id) {
         final net.minecraft.world.entity.raid.@Nullable Raid nmsRaid = this.world.getRaids().raidMap.get(id);
-        return nmsRaid != null ? new CraftRaid(nmsRaid) : null;
+        return nmsRaid != null ? new CraftRaid(nmsRaid, this.world) : null;
     }
     // Paper end - more Raid API
 
     @Override
     public List<Raid> getRaids() {
         Raids persistentRaid = this.world.getRaids();
-        return persistentRaid.raidMap.values().stream().map(CraftRaid::new).collect(Collectors.toList());
+        return persistentRaid.raidMap.values().stream().map(raid -> new CraftRaid(raid, this.world)).collect(Collectors.toList());
     }
 
     @Override

paper-server/src/main/java/org/bukkit/craftbukkit/block/CapturedBlockState.java

@@ -30,8 +30,6 @@ private CapturedBlockState(CapturedBlockState state, Location location) {
     public boolean update(boolean force, boolean applyPhysics) {
         boolean result = super.update(force, applyPhysics);
 
-        // Probably no longer needed with the extra #updatedTree method,
-        // but leave if here for now in case a plugin for whatever reason relies on this.
         if (result) {
             this.addBees();
         }
@@ -43,16 +41,14 @@ public boolean update(boolean force, boolean applyPhysics) {
     public boolean place(int flags) {
         boolean result = super.place(flags);
 
-        // Probably no longer needed with the extra #updatedTree method,
-        // but leave if here for now in case a plugin for whatever reason relies on this.
         if (result) {
             this.addBees();
         }
 
         return result;
     }
 
-    private void addBees() { // todo check if needed
+    private void addBees() {
         // SPIGOT-5537: Horrible hack to manually add bees given Level#captureTreeGeneration does not support block entities
         if (this.treeBlock && this.getType() == Material.BEE_NEST) {
             WorldGenLevel worldGenLevel = this.world.getHandle();

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java

@@ -1,8 +1,11 @@
 package org.bukkit.craftbukkit.entity;
 
+import net.minecraft.Optionull;
+import org.bukkit.Location;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.util.CraftLocation;
 import org.bukkit.entity.Phantom;
+import java.util.UUID;
 
 public class CraftPhantom extends CraftFlying implements Phantom, CraftEnemy {
 
@@ -21,8 +24,8 @@ public int getSize() {
     }
 
     @Override
-    public void setSize(int sz) {
-        this.getHandle().setPhantomSize(sz);
+    public void setSize(int size) {
+        this.getHandle().setPhantomSize(size);
     }
 
     @Override
@@ -31,7 +34,7 @@ public String toString() {
     }
 
     @Override
-    public java.util.UUID getSpawningEntity() {
+    public UUID getSpawningEntity() {
         return this.getHandle().spawningEntity;
     }
 
@@ -46,13 +49,13 @@ public void setShouldBurnInDay(boolean shouldBurnInDay) {
     }
 
     @Override
-    public org.bukkit.Location getAnchorLocation() {
-        return CraftLocation.toBukkit(this.getHandle().anchorPoint, this.getHandle().level()); // todo NPE?
+    public Location getAnchorLocation() {
+        return Optionull.map(this.getHandle().anchorPoint, pos -> CraftLocation.toBukkit(pos, this.getHandle().level()));
     }
 
     @Override
-    public void setAnchorLocation(org.bukkit.Location location) {
+    public void setAnchorLocation(Location location) {
         com.google.common.base.Preconditions.checkArgument(location != null, "location cannot be null");
-        this.getHandle().anchorPoint = CraftLocation.toBlockPosition(location); // todo allow null?
+        this.getHandle().anchorPoint = location == null ? null : CraftLocation.toBlockPosition(location);
     }
 }

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftRaider.java

@@ -33,7 +33,7 @@ public void setRaid(Raid raid) {
 
     @Override
     public Raid getRaid() {
-        return this.getHandle().getCurrentRaid() == null ? null : new CraftRaid(this.getHandle().getCurrentRaid());
+        return this.getHandle().getCurrentRaid() == null ? null : new CraftRaid(this.getHandle().getCurrentRaid(), this.getHandle().level());
     }
 
     @Override

paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java

@@ -1779,18 +1779,18 @@ public static LightningStrikeEvent callLightningStrikeEvent(LightningStrike enti
     }
 
     public static boolean callRaidTriggerEvent(Level level, Raid raid, ServerPlayer player) {
-        RaidTriggerEvent event = new RaidTriggerEvent(new CraftRaid(raid), level.getWorld(), player.getBukkitEntity());
+        RaidTriggerEvent event = new RaidTriggerEvent(new CraftRaid(raid, level), level.getWorld(), player.getBukkitEntity());
         Bukkit.getPluginManager().callEvent(event);
         return !event.isCancelled();
     }
 
     public static void callRaidFinishEvent(Level level, Raid raid, List<Player> players) {
-        RaidFinishEvent event = new RaidFinishEvent(new CraftRaid(raid), level.getWorld(), players);
+        RaidFinishEvent event = new RaidFinishEvent(new CraftRaid(raid, level), level.getWorld(), players);
         Bukkit.getPluginManager().callEvent(event);
     }
 
     public static void callRaidStopEvent(Level level, Raid raid, RaidStopEvent.Reason reason) {
-        RaidStopEvent event = new RaidStopEvent(new CraftRaid(raid), level.getWorld(), reason);
+        RaidStopEvent event = new RaidStopEvent(new CraftRaid(raid, level), level.getWorld(), reason);
         Bukkit.getPluginManager().callEvent(event);
     }
 
@@ -1800,7 +1800,7 @@ public static void callRaidSpawnWaveEvent(Level level, Raid raid, net.minecraft.
         for (net.minecraft.world.entity.raid.Raider raider : raiders) {
             bukkitRaiders.add((Raider) raider.getBukkitEntity());
         }
-        RaidSpawnWaveEvent event = new RaidSpawnWaveEvent(new CraftRaid(raid), level.getWorld(), bukkitLeader, bukkitRaiders);
+        RaidSpawnWaveEvent event = new RaidSpawnWaveEvent(new CraftRaid(raid, level), level.getWorld(), bukkitLeader, bukkitRaiders);
         event.callEvent();
     }