twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-02 21:22:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

More diff/changed variable name cleanup

Browse Source
This commit is contained in:
Nassim Jahnke
2024-12-21 12:15:25 +01:00
parent 85c428b0be
commit e0593e9286
13 changed files with 284 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
paper-server/patches/sources/net/minecraft/server/level/ServerPlayer.java.patch
View File

@@ -206,30 +206,17 @@
if (thrownEnderpearl.isRemoved()) {
LOGGER.warn("Trying to save removed ender pearl, skipping");
} else {
@@ -593,6 +_,29 @@
@@ -593,6 +_,16 @@
}
}
+ // CraftBukkit start - World fallback code, either respawn location or global spawn
+ public void spawnIn(Level world) {
+ this.setLevel(world);
+ if (world == null) {
+ this.unsetRemoved();
+ Vec3 position = null;
+ if (this.respawnDimension != null) {
+ world = this.server.getLevel(this.respawnDimension);
+ if (world != null && this.getRespawnPosition() != null) {
+ position = ServerPlayer.findRespawnAndUseSpawnBlock((ServerLevel) world, this.getRespawnPosition(), this.getRespawnAngle(), false, false).map(ServerPlayer.RespawnPosAngle::position).orElse(null);
+ }
+ }
+ if (world == null || position == null) {
+ world = ((org.bukkit.craftbukkit.CraftWorld) org.bukkit.Bukkit.getServer().getWorlds().get(0)).getHandle();
+ position = Vec3.atCenterOf(world.getSharedSpawnPos());
+ }
+ this.setLevel(world);
+ this.setPosRaw(position.x(), position.y(), position.z()); // Paper - don't register to chunks yet
+ // CraftBukkit start
+ public void spawnIn(final ServerLevel level) {
+ if (level == null) {
+ throw new IllegalArgumentException("level can't be null");
+ }
+ this.gameMode.setLevel((ServerLevel) world);
+ this.setLevel(level);
+ this.gameMode.setLevel(level);
+ }
+ // CraftBukkit end
+
@@ -840,7 +827,7 @@
+
+ {
+ {
+ Either<net.minecraft.world.entity.player.Player.BedSleepingProblem, Unit> either = super.startSleepInBed(at, force).ifRight((unit) -> {
+ Either<net.minecraft.world.entity.player.Player.BedSleepingProblem, Unit> either = super.startSleepInBed(at, force).ifRight(unit -> {
+ // CraftBukkit end
this.awardStat(Stats.SLEEP_IN_BED);
CriteriaTriggers.SLEPT_IN_BED.trigger(this);