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

Some more comments

Browse Source
This commit is contained in:
Bjarne Koll
2025-05-31 14:28:59 +02:00
parent 4a903d8124
commit 4fe0ac240b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
paper-server/patches/sources/net/minecraft/world/item/component/ResolvableProfile.java.patch
View File

@@ -17,7 +17,7 @@
Optional<GameProfile> optional; Optional<GameProfile> optional;
if (this.id.isPresent()) { if (this.id.isPresent()) {
- optional = SkullBlockEntity.fetchGameProfile(this.id.get()).getNow(null); - optional = SkullBlockEntity.fetchGameProfile(this.id.get()).getNow(null);
+ optional = SkullBlockEntity.fetchGameProfile(this.id.get(), this.name.orElse(null)).getNow(null); // Paper + optional = SkullBlockEntity.fetchGameProfile(this.id.get(), this.name.orElse(null)).getNow(null); // Paper - player profile events - pass name
} else { } else {
optional = SkullBlockEntity.fetchGameProfile(this.name.orElseThrow()).getNow(null); optional = SkullBlockEntity.fetchGameProfile(this.name.orElseThrow()).getNow(null);
} }
@@ -26,7 +26,7 @@
} else { } else {
return this.id.isPresent() return this.id.isPresent()
- ? SkullBlockEntity.fetchGameProfile(this.id.get()).thenApply(this::createProfile) - ? SkullBlockEntity.fetchGameProfile(this.id.get()).thenApply(this::createProfile)
+ ? SkullBlockEntity.fetchGameProfile(this.id.get(), this.name.orElse(null)).thenApply(this::createProfile) // Paper + ? SkullBlockEntity.fetchGameProfile(this.id.get(), this.name.orElse(null)).thenApply(this::createProfile) // Paper - player profile events - pass name
: SkullBlockEntity.fetchGameProfile(this.name.orElseThrow()).thenApply(this::createProfile); : SkullBlockEntity.fetchGameProfile(this.name.orElseThrow()).thenApply(this::createProfile);
} }
} }

2
paper-server/patches/sources/net/minecraft/world/level/GameRules.java.patch
View File

@@ -70,7 +70,7 @@
); );
public static final GameRules.Key<GameRules.BooleanValue> RULE_LOCATOR_BAR = register( public static final GameRules.Key<GameRules.BooleanValue> RULE_LOCATOR_BAR = register(
- "locatorBar", GameRules.Category.PLAYER, GameRules.BooleanValue.create(true, (server, value) -> server.getAllLevels().forEach(level -> { - "locatorBar", GameRules.Category.PLAYER, GameRules.BooleanValue.create(true, (server, value) -> server.getAllLevels().forEach(level -> {
+ "locatorBar", GameRules.Category.PLAYER, GameRules.BooleanValue.create(true, (server, value) -> java.util.Optional.of(server).ifPresent(level -> { // Paper + "locatorBar", GameRules.Category.PLAYER, GameRules.BooleanValue.create(true, (server, value) -> java.util.Optional.of(server).ifPresent(level -> { // Paper - per world game rules
ServerWaypointManager waypointManager = level.getWaypointManager(); ServerWaypointManager waypointManager = level.getWaypointManager();
if (value.get()) { if (value.get()) {
level.players().forEach(waypointManager::updatePlayer); level.players().forEach(waypointManager::updatePlayer);