TheWhiteDog9487/RandomTeleporter
1
0
Fork 0
mirror of https://github.com/TheWhiteDog9487/RandomTeleporter.git synced 2025-10-15 16:05:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

现在被传送实体会在自己所在世界内被传送，不会受到命令执行方所在世界和自己不一致的影响

Browse Source 
重命名函数和变量
This commit is contained in:
TheWhiteDog9487
2025-10-05 14:13:32 +08:00
parent e7f9ac069a
commit 33e01b3d35
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/xyz/thewhitedog9487/CommandRegister.java
View File

@@ -189,21 +189,21 @@ public class CommandRegister {
*
* @param Source 命令执行者
* @param Radius 随机选择的目的坐标距离参数 {@code Origin} 的最大距离
* @param Player 被传送的玩家
* @param Entity 被传送的实体
* @param Origin 随机选择的目的坐标的中心
* @return 命令运行是否成功
*/
static int execute_command(ServerCommandSource Source, @Nullable Integer Radius, @Nullable Entity Player, @Nullable Vec2f Origin){
Entity entity = Player == null ? Source.getPlayer() : Player;
static int ExecuteCommand(ServerCommandSource Source, @Nullable Integer Radius, @Nullable Entity Entity, @Nullable Vec2f Origin){
Entity TargetEntity = Entity == null ? Source.getPlayer() : Entity;
/*
↑
Entity entity = null;
if (Player == null){
entity = Source.getPlayer();}
Entity TargetEntity = null;
if (TargetEntity == null){
TargetEntity = Source.getPlayer();}
else{
entity = Player;}
TargetEntity = Entity;}
*/
if (entity == null) {
if (TargetEntity == null) {
Source.sendFeedback(()->{ return Text.translatableWithFallback("error.no_target","不存在被传送目标，由非玩家物体执行命令时请显式指定被传送玩家ID"); }, true);
return -1;}
if (Radius == null){Radius = (int) (WorldBorder - 1e4);}
@@ -250,13 +250,13 @@ public class CommandRegister {
// 只替换空气、水和岩浆，其余保留
Source.getWorld().setBlockState(BlockPos, Blocks.GLASS.getDefaultState());}}}
// if ( String.valueOf(entity.getWorld().getBiome(new BlockPos(Math.toIntExact(Coordinate_X), Coordinate_Y, Math.toIntExact(Coordinate_Z))).getKey()).equals("minecraft:the_void") ) {
World EntityWorld = TargetEntity.getEntityWorld();
World EntityWorld = TargetEntity.getEntityWorld();
if ( ReplaceToTargetBlock.contains(CurrentBlock) ) {
// 只替换ReplaceToTargetBlock内的方块，其余保留
EntityWorld.setBlockState(BlockPos, TargetBlock.getDefaultState());}}}
// Coordinate_Y++;}
Coordinate_Y++;
// ↑ 高一层，人别站在土里了
entity.teleport(Source.getWorld(),Coordinate_X + 0.5, Coordinate_Y, Coordinate_Z + 0.5, new HashSet<>(), entity.getYaw(), entity.getPitch(), false);
TargetEntity.teleport((ServerWorld) EntityWorld,Coordinate_X + 0.5, Coordinate_Y, Coordinate_Z + 0.5, new HashSet<>(), TargetEntity.getYaw(), TargetEntity.getPitch(), false);
int finalCoordinate_X = Coordinate_X;
int finalCoordinate_Y = Coordinate_Y;
int finalCoordinate_Z = Coordinate_Z;