diff options
| author | Jake Potrebic <[email protected]> | 2024-04-27 15:50:33 -0700 |
|---|---|---|
| committer | Jake Potrebic <[email protected]> | 2024-04-27 15:50:38 -0700 |
| commit | d02bb811de6f9d7e42001137b93d6a6f88359ab6 (patch) | |
| tree | a396cbb1f0ada45b98703f8125f06f17334dc080 /patches/server/0873-Fix-rotation-when-spawning-display-entities.patch | |
| parent | dd571d89f2202bda719a40fd15f92cc754b6ade1 (diff) | |
| download | Paper-d02bb811de6f9d7e42001137b93d6a6f88359ab6.tar.gz Paper-d02bb811de6f9d7e42001137b93d6a6f88359ab6.zip | |
proper migration to gamerules for keep spawn loaded distance
Diffstat (limited to 'patches/server/0873-Fix-rotation-when-spawning-display-entities.patch')
| -rw-r--r-- | patches/server/0873-Fix-rotation-when-spawning-display-entities.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/patches/server/0873-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0873-Fix-rotation-when-spawning-display-entities.patch new file mode 100644 index 0000000000..a027b8b8bb --- /dev/null +++ b/patches/server/0873-Fix-rotation-when-spawning-display-entities.patch @@ -0,0 +1,32 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Gameoholic <[email protected]> +Date: Sun, 30 Jul 2023 13:30:34 +0300 +Subject: [PATCH] Fix rotation when spawning display entities + + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java +index 63f9852de5b557351793ba3aebdd7e752caf2417..2c44056065b75efecdf7bc835d1e899d1b50ccfe 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java +@@ -220,6 +220,7 @@ public final class CraftEntityTypes { + Vector direction = spawnData.location().getDirection().multiply(10); + entity.assignPower(direction.getX(), direction.getY(), direction.getZ()); + }; ++ private static final BiConsumer<SpawnData, net.minecraft.world.entity.Entity> ROT = (spawnData, entity) -> entity.setRot(spawnData.yaw(), spawnData.pitch()); // Paper + private static final Map<Class<?>, EntityTypeData<?, ?>> CLASS_TYPE_DATA = new HashMap<>(); + private static final Map<EntityType, EntityTypeData<?, ?>> ENTITY_TYPE_DATA = new HashMap<>(); + +@@ -360,10 +361,10 @@ public final class CraftEntityTypes { + + // Set pos + register(new EntityTypeData<>(EntityType.MARKER, Marker.class, CraftMarker::new, createAndSetPos(net.minecraft.world.entity.EntityType.MARKER))); +- register(new EntityTypeData<>(EntityType.BLOCK_DISPLAY, BlockDisplay.class, CraftBlockDisplay::new, createAndSetPos(net.minecraft.world.entity.EntityType.BLOCK_DISPLAY))); ++ register(new EntityTypeData<>(EntityType.BLOCK_DISPLAY, BlockDisplay.class, CraftBlockDisplay::new, combine(createAndSetPos(net.minecraft.world.entity.EntityType.BLOCK_DISPLAY), ROT))); // Paper + register(new EntityTypeData<>(EntityType.INTERACTION, Interaction.class, CraftInteraction::new, createAndSetPos(net.minecraft.world.entity.EntityType.INTERACTION))); +- register(new EntityTypeData<>(EntityType.ITEM_DISPLAY, ItemDisplay.class, CraftItemDisplay::new, createAndSetPos(net.minecraft.world.entity.EntityType.ITEM_DISPLAY))); +- register(new EntityTypeData<>(EntityType.TEXT_DISPLAY, TextDisplay.class, CraftTextDisplay::new, createAndSetPos(net.minecraft.world.entity.EntityType.TEXT_DISPLAY))); ++ register(new EntityTypeData<>(EntityType.ITEM_DISPLAY, ItemDisplay.class, CraftItemDisplay::new, combine(createAndSetPos(net.minecraft.world.entity.EntityType.ITEM_DISPLAY), ROT))); // Paper ++ register(new EntityTypeData<>(EntityType.TEXT_DISPLAY, TextDisplay.class, CraftTextDisplay::new, combine(createAndSetPos(net.minecraft.world.entity.EntityType.TEXT_DISPLAY), ROT))); // Paper + + // MISC + register(new EntityTypeData<>(EntityType.ITEM, Item.class, CraftItem::new, spawnData -> { |