XFE Git
XFE Studio Git
Git 首页 全局搜索
XFE 主站 文档 NuGet

MyDimension

【Java】我的维度模组

公开
关注 0 Fork 0 Star 0
返回提交历史

XFEstudio/MyDimension

修复生物刷怪蛋不能在心境中使用的问题

fab9a21
XFE工作室室长 <mail@xfegzs.com>
提交于

代码差异

2 个文件 +1 -21
Modified gradle.properties +1 -1
@@ -11,7 +11,7 @@ loader_version_range=[47,)
11 11 mod_id=mydimension
12 12 mod_name=\u6211\u7684\u7ef4\u5ea6
13 13 mod_license=CC0-1.0
14 mod_version=2.2.2
14 mod_version=2.2.3
15 15 mod_group_id=com.xfestudio.mydimension
16 16 maven_group=com.xfestudio
17 17 archives_base_name=mydimension
Modified src/main/java/com/xfestudio/mydimension/MyDimensionEvents.java +0 -20
@@ -24,13 +24,11 @@ import net.minecraft.world.entity.Entity;
24 24 import net.minecraft.world.entity.LivingEntity;
25 25 import net.minecraft.world.entity.Mob;
26 26 import net.minecraft.world.entity.MobSpawnType;
27 import net.minecraft.world.entity.monster.Enemy;
28 27 import net.minecraft.world.item.ItemStack;
29 28 import net.minecraft.world.level.GameRules;
30 29 import net.minecraft.tags.FluidTags;
31 30 import net.minecraftforge.event.CommandEvent;
32 31 import net.minecraftforge.event.TickEvent;
33 import net.minecraftforge.event.entity.EntityJoinLevelEvent;
34 32 import net.minecraftforge.event.entity.living.MobSpawnEvent;
35 33 import net.minecraftforge.event.entity.player.PlayerEvent;
36 34 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
@@ -73,20 +71,6 @@ public class MyDimensionEvents {
73 71 }
74 72 }
75 73
76 @SubscribeEvent(priority = EventPriority.HIGHEST)
77 public void preventBypassedHostileSpawnsInMind(EntityJoinLevelEvent event) {
78 if (event.getLevel().isClientSide() || !ModDimensions.isMindDimension(event.getLevel().dimension())) {
79 return;
80 }
81
82 if (event.getEntity() instanceof Mob mob
83 && isHostileMob(mob)
84 && !mob.getPersistentData().getBoolean(RiftItem.IMPORTED_TO_ETHEREAL_MIND)
85 && !event.loadedFromDisk()) {
86 event.setCanceled(true);
87 }
88 }
89
90 74 @SubscribeEvent
91 75 public void protectPlayersFromOtherPlayerTeleports(CommandEvent event) {
92 76 CommandSourceStack source = event.getParseResults().getContext().getSource();
@@ -259,10 +243,6 @@ public class MyDimensionEvents {
259 243 return !entity.getPersistentData().getBoolean(RiftItem.IMPORTED_TO_ETHEREAL_MIND) && !isPlayerCreatedSpawn(spawnType);
260 244 }
261 245
262 private static boolean isHostileMob(Mob entity) {
263 return entity instanceof Enemy || entity.getType().getCategory() == net.minecraft.world.entity.MobCategory.MONSTER;
264 }
265
266 246 private static boolean isPlayerCreatedSpawn(MobSpawnType spawnType) {
267 247 return spawnType == MobSpawnType.SPAWN_EGG || spawnType == MobSpawnType.BUCKET;
268 248 }