Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-24 11:15:21 +01:00
Code Issues Projects Releases Wiki Activity

fixed respawn event (player returning from end to overworld)

Browse Source
This commit is contained in:
Pierre Kisters 2020-08-16 03:22:37 +02:00
parent ae40a6f47e
commit 284def319a
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fabric-1.16.1/src/main/java/org/dynmap/fabric_1_16_1/mixin/PlayerManagerMixin.java
View File

@ -22,8 +22,8 @@ public class PlayerManagerMixin {
PlayerEvents.PLAYER_LOGGED_OUT.invoker().onPlayerLoggedOut(player); PlayerEvents.PLAYER_LOGGED_OUT.invoker().onPlayerLoggedOut(player);
} }
@Inject(method = "respawnPlayer", at = @At("TAIL")) @Inject(method = "respawnPlayer", at = @At("RETURN"))
public void respawnPlayer(ServerPlayerEntity player, boolean alive, CallbackInfoReturnable<ServerPlayerEntity> info) { public void respawnPlayer(ServerPlayerEntity player, boolean alive, CallbackInfoReturnable<ServerPlayerEntity> info) {
PlayerEvents.PLAYER_RESPAWN.invoker().onPlayerRespawn(player); PlayerEvents.PLAYER_RESPAWN.invoker().onPlayerRespawn(info.getReturnValue());
} }
} }

8
fabric-1.16.1/src/main/java/org/dynmap/fabric_1_16_1/mixin/ServerPlayerEntityMixin.java
View File

@ -12,15 +12,19 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(ServerPlayerEntity.class) @Mixin(ServerPlayerEntity.class)
public class ServerPlayerEntityMixin { public class ServerPlayerEntityMixin {
@Inject(method = "teleport", at = @At("TAIL")) @Inject(method = "teleport", at = @At("RETURN"))
public void teleport(ServerWorld targetWorld, double x, double y, double z, float yaw, float pitch, CallbackInfo info) { public void teleport(ServerWorld targetWorld, double x, double y, double z, float yaw, float pitch, CallbackInfo info) {
ServerPlayerEntity player = (ServerPlayerEntity) (Object) this; ServerPlayerEntity player = (ServerPlayerEntity) (Object) this;
if (targetWorld != player.world) {
PlayerEvents.PLAYER_CHANGED_DIMENSION.invoker().onPlayerChangedDimension(player); PlayerEvents.PLAYER_CHANGED_DIMENSION.invoker().onPlayerChangedDimension(player);
} }
}
@Inject(method = "changeDimension", at = @At("TAIL")) @Inject(method = "changeDimension", at = @At("RETURN"))
public void changeDimension(ServerWorld destination, CallbackInfoReturnable<Entity> info) { public void changeDimension(ServerWorld destination, CallbackInfoReturnable<Entity> info) {
ServerPlayerEntity player = (ServerPlayerEntity) (Object) this; ServerPlayerEntity player = (ServerPlayerEntity) (Object) this;
if (!player.removed) {
PlayerEvents.PLAYER_CHANGED_DIMENSION.invoker().onPlayerChangedDimension(player); PlayerEvents.PLAYER_CHANGED_DIMENSION.invoker().onPlayerChangedDimension(player);
} }
}
} }

4
fabric-1.16.2/src/main/java/org/dynmap/fabric_1_16_2/mixin/PlayerManagerMixin.java
View File

@ -22,8 +22,8 @@ public class PlayerManagerMixin {
PlayerEvents.PLAYER_LOGGED_OUT.invoker().onPlayerLoggedOut(player); PlayerEvents.PLAYER_LOGGED_OUT.invoker().onPlayerLoggedOut(player);
} }
@Inject(method = "respawnPlayer", at = @At("TAIL")) @Inject(method = "respawnPlayer", at = @At("RETURN"))
public void respawnPlayer(ServerPlayerEntity player, boolean alive, CallbackInfoReturnable<ServerPlayerEntity> info) { public void respawnPlayer(ServerPlayerEntity player, boolean alive, CallbackInfoReturnable<ServerPlayerEntity> info) {
PlayerEvents.PLAYER_RESPAWN.invoker().onPlayerRespawn(player); PlayerEvents.PLAYER_RESPAWN.invoker().onPlayerRespawn(info.getReturnValue());
} }
} }

8
fabric-1.16.2/src/main/java/org/dynmap/fabric_1_16_2/mixin/ServerPlayerEntityMixin.java
View File

@ -12,15 +12,19 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(ServerPlayerEntity.class) @Mixin(ServerPlayerEntity.class)
public class ServerPlayerEntityMixin { public class ServerPlayerEntityMixin {
@Inject(method = "teleport", at = @At("TAIL")) @Inject(method = "teleport", at = @At("RETURN"))
public void teleport(ServerWorld targetWorld, double x, double y, double z, float yaw, float pitch, CallbackInfo info) { public void teleport(ServerWorld targetWorld, double x, double y, double z, float yaw, float pitch, CallbackInfo info) {
ServerPlayerEntity player = (ServerPlayerEntity) (Object) this; ServerPlayerEntity player = (ServerPlayerEntity) (Object) this;
if (targetWorld != player.world) {
PlayerEvents.PLAYER_CHANGED_DIMENSION.invoker().onPlayerChangedDimension(player); PlayerEvents.PLAYER_CHANGED_DIMENSION.invoker().onPlayerChangedDimension(player);
} }
}
@Inject(method = "moveToWorld", at = @At("TAIL")) @Inject(method = "moveToWorld", at = @At("RETURN"))
public void moveToWorld(ServerWorld destination, CallbackInfoReturnable<Entity> info) { public void moveToWorld(ServerWorld destination, CallbackInfoReturnable<Entity> info) {
ServerPlayerEntity player = (ServerPlayerEntity) (Object) this; ServerPlayerEntity player = (ServerPlayerEntity) (Object) this;
if (!player.removed) {
PlayerEvents.PLAYER_CHANGED_DIMENSION.invoker().onPlayerChangedDimension(player); PlayerEvents.PLAYER_CHANGED_DIMENSION.invoker().onPlayerChangedDimension(player);
} }
}
} }