diff options
| author | Nassim Jahnke <[email protected]> | 2022-07-25 18:44:24 +0200 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2022-07-25 18:44:24 +0200 |
| commit | 345a6a620524ee18db251da2bbb48ff32864be2f (patch) | |
| tree | fe4d23e3fcab4294f5bc9e78d19e0506d0942ba4 /patches/server/0692-Add-PlayerSetSpawnEvent.patch | |
| parent | 22ac7d68179511e2b7d418eb988353bf71d35db8 (diff) | |
| download | Paper-345a6a620524ee18db251da2bbb48ff32864be2f.tar.gz Paper-345a6a620524ee18db251da2bbb48ff32864be2f.zip | |
Updated Upstream (CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
CraftBukkit Changes:
ef0946409 PR-1091: Fix exit position in entity travel with portals
d12768f75 PR-1090: Remove no longer needed world reference from CraftMerchantCustom
7550f6854 SPIGOT-7115: Support hex color codes in custom merchant inventory titles
Diffstat (limited to 'patches/server/0692-Add-PlayerSetSpawnEvent.patch')
| -rw-r--r-- | patches/server/0692-Add-PlayerSetSpawnEvent.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/server/0692-Add-PlayerSetSpawnEvent.patch b/patches/server/0692-Add-PlayerSetSpawnEvent.patch index c4e296d415..6ff40263a0 100644 --- a/patches/server/0692-Add-PlayerSetSpawnEvent.patch +++ b/patches/server/0692-Add-PlayerSetSpawnEvent.patch @@ -32,10 +32,10 @@ index ce1c7512cc368e196ae94ee22c6a228c975b4980..1e41de9523c5fa3b9cfced798a5c35a2 String string = resourceKey.location().toString(); if (targets.size() == 1) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index eb0d36082d3e6af7463b767dbb64be146941cc6d..157be83b74298b848a47436ab0fea9a04556a3ce 100644 +index 99bac7e1975559165653df973e6eef79450b1254..2e205bd42101889097c08a1ffa1103c3e838240c 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1288,7 +1288,7 @@ public class ServerPlayer extends Player { +@@ -1289,7 +1289,7 @@ public class ServerPlayer extends Player { } else if (this.bedBlocked(blockposition, enumdirection)) { return Either.left(Player.BedSleepingProblem.OBSTRUCTED); } else { @@ -44,7 +44,7 @@ index eb0d36082d3e6af7463b767dbb64be146941cc6d..157be83b74298b848a47436ab0fea9a0 if (this.level.isDay()) { return Either.left(Player.BedSleepingProblem.NOT_POSSIBLE_NOW); } else { -@@ -2133,12 +2133,33 @@ public class ServerPlayer extends Player { +@@ -2134,12 +2134,33 @@ public class ServerPlayer extends Player { return this.respawnForced; } @@ -80,7 +80,7 @@ index eb0d36082d3e6af7463b767dbb64be146941cc6d..157be83b74298b848a47436ab0fea9a0 } this.respawnPosition = pos; -@@ -2152,6 +2173,7 @@ public class ServerPlayer extends Player { +@@ -2153,6 +2174,7 @@ public class ServerPlayer extends Player { this.respawnForced = false; } |