43 lines
2.2 KiB
Diff
43 lines
2.2 KiB
Diff
|
From 0000000000000000000000000000000000000000 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 4bba6977a0287837b8927718c040ac61463f0469..e6e18f309dc09ea9416ea37dcc697ddc2b571a96 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -149,4 +149,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/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
||
|
|
index 5ef8b66cf266488df75ce7399596f75273b90761..808bb68b3c5115b1219a65d0dd253bd60d543652 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
|
||
|
|
@@ -191,7 +191,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||
|
|
private long ca = SystemUtils.getMonotonicMillis();
|
||
|
|
private Entity spectatedEntity;
|
||
|
|
public boolean worldChangeInvuln;
|
||
|
|
- private boolean cd;
|
||
|
|
+ private boolean cd; private void setHasSeenCredits(boolean has) { this.cd = has; } // Paper - OBFHELPER
|
||
|
|
private final RecipeBookServer recipeBook = new RecipeBookServer();
|
||
|
|
private Vec3D cf;
|
||
|
|
private int cg;
|
||
|
|
@@ -896,6 +896,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||
|
|
this.decouple();
|
||
|
|
this.getWorldServer().removePlayer(this);
|
||
|
|
if (!this.viewingCredits) {
|
||
|
|
+ if (world.paperConfig.disableEndCredits) this.setHasSeenCredits(true); // Paper - Toggle to always disable end credits
|
||
|
|
this.viewingCredits = true;
|
||
|
|
this.playerConnection.sendPacket(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.e, this.cd ? 0.0F : 1.0F));
|
||
|
|
this.cd = true;
|