Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 12:30:06 +01:00
637a5bcfec
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 04405534 SPIGOT-5034: FoodLevelChangeEvent add getItem method 8154c64c SPIGOT-4984: EnchantmentOffer.getCost() documentation is misleading CraftBukkit Changes:f2757f95SPIGOT-5071: Player loot tables not triggeredf4242226Optimize getEntitiesByClasses slightlye81013d7SPIGOT-5072: Process phantom, cat and patrol spawning in CustomChunkGenerator30a63379SPIGOT-5010: World#getEntitiesByClass/es also return entities in border chunks.43431ba6SPIGOT-5034: FoodLevelChangeEvent add getItem method
46 Zeilen
2.0 KiB
Diff
46 Zeilen
2.0 KiB
Diff
From 08f004e8c862bfb241bd86d5b5877b6416cd3eda Mon Sep 17 00:00:00 2001
|
|
From: DoctorDark <doctordark11@gmail.com>
|
|
Date: Wed, 16 Mar 2016 02:21:39 -0500
|
|
Subject: [PATCH] Configurable end credits
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
index a797a57671..c2b9690a0c 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -139,4 +139,10 @@ public class PaperWorldConfig {
|
|
}
|
|
}
|
|
}
|
|
+
|
|
+ public boolean disableEndCredits;
|
|
+ private void disableEndCredits() {
|
|
+ disableEndCredits = getBoolean("game-mechanics.disable-end-credits", false);
|
|
+ log("End credits disabled: " + disableEndCredits);
|
|
+ }
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
index f7cf02f588..e60ead5ecb 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
@@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
private long cm = SystemUtils.getMonotonicMillis();
|
|
private Entity spectatedEntity;
|
|
public boolean worldChangeInvuln;
|
|
- private boolean cp;
|
|
+ private boolean cp; private void setHasSeenCredits(boolean has) { this.cp = has; } // Paper - OBFHELPER
|
|
private final RecipeBookServer recipeBook;
|
|
private Vec3D cr;
|
|
private int cs;
|
|
@@ -704,6 +704,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
this.getWorldServer().removePlayer(this);
|
|
if (!this.viewingCredits) {
|
|
this.viewingCredits = true;
|
|
+ if (world.paperConfig.disableEndCredits) this.setHasSeenCredits(true); // Paper - Toggle to always disable end credits
|
|
this.playerConnection.sendPacket(new PacketPlayOutGameStateChange(4, this.cp ? 0.0F : 1.0F));
|
|
this.cp = true;
|
|
}
|
|
--
|
|
2.22.0
|
|
|