MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Another round of minor changes

Browse source
This commit is contained in:
Frank Bauer 2021-06-24 12:34:12 +02:00
parent 32f9bf288e
commit 8555931932
6 changed files with 29 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/ru/betterend/mixin/common/ServerPlayerMixin.java
View file

@ -69,7 +69,7 @@ public abstract class ServerPlayerMixin extends Player implements TeleportingEnt
@Inject(method = "findDimensionEntryPoint", at = @At("HEAD"), cancellable = true)
protected void be_getTeleportTarget(ServerLevel destination, CallbackInfoReturnable<PortalInfo> info) {
if (be_canTeleport()) {
info.setReturnValue(new PortalInfo(new Vec3(exitPos.getX() + 0.5, exitPos.getY(), exitPos.getZ() + 0.5), getDeltaMovement(), yRot, xRot));
info.setReturnValue(new PortalInfo(new Vec3(exitPos.getX() + 0.5, exitPos.getY(), exitPos.getZ() + 0.5), getDeltaMovement(), getYRot(), getXRot()));
}
}
@ -85,21 +85,21 @@ public abstract class ServerPlayerMixin extends Player implements TeleportingEnt
connection.send(new ClientboundChangeDifficultyPacket(worldProperties.getDifficulty(), worldProperties.isDifficultyLocked()));
PlayerList playerManager = server.getPlayerList();
playerManager.sendPlayerPermissionLevel(player);
serverWorld.removePlayerImmediately(player);
removed = false;
serverWorld.removePlayerImmediately(player, RemovalReason.CHANGED_DIMENSION);
unsetRemoved();
PortalInfo teleportTarget = findDimensionEntryPoint(destination);
if (teleportTarget != null) {
serverWorld.getProfiler().push("moving");
serverWorld.getProfiler().pop();
serverWorld.getProfiler().push("placing");
setLevel(destination);
this.level = destination;
destination.addDuringPortalTeleport(player);
setRot(teleportTarget.yRot, teleportTarget.xRot);
moveTo(teleportTarget.pos.x, teleportTarget.pos.y, teleportTarget.pos.z);
serverWorld.getProfiler().pop();
triggerDimensionChangeTriggers(serverWorld);
gameMode.setLevel(destination);
connection.send(new ClientboundPlayerAbilitiesPacket(abilities));
connection.send(new ClientboundPlayerAbilitiesPacket(getAbilities()));
playerManager.sendLevelInfo(player, destination);
playerManager.sendAllPlayerInfo(player);