twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-14 19:55:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

Implement tracking range y setting

Browse Source
This commit is contained in:
Nassim Jahnke
2023-10-03 22:19:39 +10:00
parent a4d2616808
commit 7d1b302774
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
patches/server/Paper-config-files.patch
View File

@@ -1532,9 +1532,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+import net.minecraft.world.entity.Display; +import net.minecraft.world.entity.Display;
+import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.ExperienceOrb;
+import net.minecraft.world.entity.MobCategory; +import net.minecraft.world.entity.MobCategory;
+import net.minecraft.world.entity.boss.enderdragon.EnderDragon;
+import net.minecraft.world.entity.decoration.HangingEntity;
+import net.minecraft.world.entity.decoration.ItemFrame;
+import net.minecraft.world.entity.decoration.Painting;
+import net.minecraft.world.entity.item.ItemEntity;
+import net.minecraft.world.entity.monster.Vindicator; +import net.minecraft.world.entity.monster.Vindicator;
+import net.minecraft.world.entity.monster.Zombie; +import net.minecraft.world.entity.monster.Zombie;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.Item; +import net.minecraft.world.item.Item;
+import net.minecraft.world.item.Items; +import net.minecraft.world.item.Items;
+import net.minecraft.world.level.NaturalSpawner; +import net.minecraft.world.level.NaturalSpawner;
@@ -1805,31 +1812,26 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ public IntOr.Default other = IntOr.Default.USE_DEFAULT; + public IntOr.Default other = IntOr.Default.USE_DEFAULT;
+ +
+ public int get(Entity entity, int def) { + public int get(Entity entity, int def) {
+ return def; // TODO https://github.com/PaperMC/Paper/issues/9742 + if (entity instanceof EnderDragon) {
+ /* + return -1; // Ender dragon is exempt
+ switch (TrackingRange.getTrackingRangeType(entity)) { + } else if (entity instanceof Display) {
+ case PLAYER -> { + return display.or(def);
+ } else if (entity instanceof Player) {
+ return player.or(def); + return player.or(def);
+ } + } else if (entity instanceof HangingEntity || entity instanceof ItemEntity || entity instanceof ExperienceOrb) {
+ case ANIMAL -> {
+ return animal.or(def);
+ }
+ case MONSTER -> {
+ return monster.or(def);
+ }
+ case MISC -> {
+ return misc.or(def); + return misc.or(def);
+ } + }
+ case ENDERDRAGON -> { + switch (entity.activationType) {
+ return -1; // Ender dragon is exempt + case ANIMAL, WATER, VILLAGER -> {
+ return animal.or(def);
+ } + }
+ case DISPLAY -> { + case MONSTER, FLYING_MONSTER, RAIDER -> {
+ return display.or(def); + return monster.or(def);
+ } + }
+ } + default -> {
+
+ return other.or(def); + return other.or(def);
+ */ + }
+ }
+ } + }
+ } + }
+ } + }