diff options
| author | Jakub Zacek <[email protected]> | 2024-07-15 23:35:51 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-07-15 17:35:51 -0400 |
| commit | 2cd8c461af74f0a524878dcdffba86cd105c48c6 (patch) | |
| tree | ac107a76fe3d6cdd2e6ef5804ef3cba152957e4c /patches/server/0853-Fix-rotation-when-spawning-display-entities.patch | |
| parent | b57b24d549c65ddc5eb3edcc1ecc6aad2826dbd8 (diff) | |
| download | Paper-2cd8c461af74f0a524878dcdffba86cd105c48c6.tar.gz Paper-2cd8c461af74f0a524878dcdffba86cd105c48c6.zip | |
Add OMINOUS_ITEM_SPAWNER SpawnReason (#10897)
Diffstat (limited to 'patches/server/0853-Fix-rotation-when-spawning-display-entities.patch')
| -rw-r--r-- | patches/server/0853-Fix-rotation-when-spawning-display-entities.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/patches/server/0853-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0853-Fix-rotation-when-spawning-display-entities.patch new file mode 100644 index 0000000000..7491ff60fe --- /dev/null +++ b/patches/server/0853-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 577ed3656480271a491bcd3d346c63854fd840e4..39aa116193f313f53540b0135d2ab26acb7f1469 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java +@@ -221,6 +221,7 @@ public final class CraftEntityTypes { + Vector direction = spawnData.location().getDirection(); + entity.assignDirectionalMovement(new Vec3(direction.getX(), direction.getY(), direction.getZ()), 1.0); + }; ++ 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<>(); + +@@ -361,10 +362,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 -> { |