mirror of
https://github.com/PaperMC/Paper.git
synced 2025-07-30 19:52:06 -07:00
bale o' patches
This commit is contained in:
@@ -15,17 +15,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
- this.player.level.getCraftServer().getPluginManager().callEvent(new org.bukkit.event.player.PlayerAdvancementDoneEvent(this.player.getBukkitEntity(), advancement.bukkit)); // CraftBukkit
|
- this.player.level.getCraftServer().getPluginManager().callEvent(new org.bukkit.event.player.PlayerAdvancementDoneEvent(this.player.getBukkitEntity(), advancement.bukkit)); // CraftBukkit
|
||||||
+ // Paper start - Add Adventure message to PlayerAdvancementDoneEvent
|
+ // Paper start - Add Adventure message to PlayerAdvancementDoneEvent
|
||||||
+ boolean announceToChat = advancement.getDisplay() != null && advancement.getDisplay().shouldAnnounceChat();
|
+ boolean announceToChat = advancement.getDisplay() != null && advancement.getDisplay().shouldAnnounceChat();
|
||||||
+ net.kyori.adventure.text.Component message = announceToChat ? io.papermc.paper.adventure.PaperAdventure.asAdventure(new TranslatableComponent("chat.type.advancement." + advancement.getDisplay().getFrame().getName(), this.player.getDisplayName(), advancement.getChatComponent())) : null;
|
+ net.kyori.adventure.text.Component message = announceToChat ? io.papermc.paper.adventure.PaperAdventure.asAdventure(Component.translatable("chat.type.advancement." + advancement.getDisplay().getFrame().getName(), this.player.getDisplayName(), advancement.getChatComponent())) : null;
|
||||||
+ org.bukkit.event.player.PlayerAdvancementDoneEvent event = new org.bukkit.event.player.PlayerAdvancementDoneEvent(this.player.getBukkitEntity(), advancement.bukkit, message);
|
+ org.bukkit.event.player.PlayerAdvancementDoneEvent event = new org.bukkit.event.player.PlayerAdvancementDoneEvent(this.player.getBukkitEntity(), advancement.bukkit, message);
|
||||||
+ this.player.level.getCraftServer().getPluginManager().callEvent(event);
|
+ this.player.level.getCraftServer().getPluginManager().callEvent(event);
|
||||||
+ message = event.message();
|
+ message = event.message();
|
||||||
+ // Paper end
|
+ // Paper end
|
||||||
advancement.getRewards().grant(this.player);
|
advancement.getRewards().grant(this.player);
|
||||||
- if (advancement.getDisplay() != null && advancement.getDisplay().shouldAnnounceChat() && this.player.level.getGameRules().getBoolean(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)) {
|
- if (advancement.getDisplay() != null && advancement.getDisplay().shouldAnnounceChat() && this.player.level.getGameRules().getBoolean(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)) {
|
||||||
- this.playerList.broadcastMessage(new TranslatableComponent("chat.type.advancement." + advancement.getDisplay().getFrame().getName(), new Object[]{this.player.getDisplayName(), advancement.getChatComponent()}), ChatType.SYSTEM, Util.NIL_UUID);
|
- this.playerList.broadcastSystemMessage(Component.translatable("chat.type.advancement." + advancement.getDisplay().getFrame().getName(), this.player.getDisplayName(), advancement.getChatComponent()), ChatType.SYSTEM);
|
||||||
+ // Paper start - Add Adventure message to PlayerAdvancementDoneEvent
|
+ // Paper start - Add Adventure message to PlayerAdvancementDoneEvent
|
||||||
+ if (message != null && this.player.level.getGameRules().getBoolean(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)) {
|
+ if (message != null && this.player.level.getGameRules().getBoolean(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)) {
|
||||||
+ this.playerList.broadcastMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), ChatType.SYSTEM, Util.NIL_UUID);
|
+ this.playerList.broadcastSystemMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), ChatType.SYSTEM);
|
||||||
+ // Paper end
|
+ // Paper end
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -12,7 +12,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
--- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
|
--- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
|
||||||
+++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
|
+++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
|
||||||
@@ -0,0 +0,0 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
|
@@ -0,0 +0,0 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
|
||||||
private static final Component IGNORE_STATUS_REASON = new TextComponent("Ignoring status request");
|
private static final Component IGNORE_STATUS_REASON = Component.literal("Ignoring status request");
|
||||||
private final MinecraftServer server;
|
private final MinecraftServer server;
|
||||||
private final Connection connection;
|
private final Connection connection;
|
||||||
+ private static final boolean BYPASS_HOSTCHECK = Boolean.getBoolean("Paper.bypassHostCheck"); // Paper
|
+ private static final boolean BYPASS_HOSTCHECK = Boolean.getBoolean("Paper.bypassHostCheck"); // Paper
|
@@ -25,7 +25,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
this.explodeBed(finaliblockdata, world, finalblockposition);
|
this.explodeBed(finaliblockdata, world, finalblockposition);
|
||||||
} else
|
} else
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
if (entityhuman_enumbedresult != null) {
|
if (entityhuman_enumbedresult.getMessage() != null) {
|
||||||
- player.displayClientMessage(entityhuman_enumbedresult.getMessage(), true);
|
- player.displayClientMessage(entityhuman_enumbedresult.getMessage(), true);
|
||||||
+ final net.kyori.adventure.text.Component message = event.getMessage(); // Paper
|
+ final net.kyori.adventure.text.Component message = event.getMessage(); // Paper
|
||||||
+ if (message != null) player.displayClientMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), true); // Paper
|
+ if (message != null) player.displayClientMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), true); // Paper
|
@@ -12,8 +12,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
if (blockEntity.isLit() && furnaceBurnEvent.isBurning()) {
|
if (blockEntity.isLit() && furnaceBurnEvent.isBurning()) {
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
flag1 = true;
|
flag1 = true;
|
||||||
- if (!itemstack.isEmpty()) {
|
- if (flag3) {
|
||||||
+ if (!itemstack.isEmpty() && furnaceBurnEvent.willConsumeFuel()) { // Paper
|
+ if (flag3 && furnaceBurnEvent.willConsumeFuel()) { // Paper
|
||||||
Item item = itemstack.getItem();
|
Item item = itemstack.getItem();
|
||||||
|
|
||||||
itemstack.shrink(1);
|
itemstack.shrink(1);
|
Reference in New Issue
Block a user