2018-12-17 05:18:06 +00:00
|
|
|
From 218a1980882ca92ea3578f3ad4d3a34804dbda7e Mon Sep 17 00:00:00 2001
|
2016-03-16 07:21:39 +00:00
|
|
|
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
|
2018-12-17 05:18:06 +00:00
|
|
|
index 8f6f0288b..5aee23dce 100644
|
2016-03-16 07:21:39 +00:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2018-09-26 04:57:59 +00:00
|
|
|
@@ -138,4 +138,10 @@ public class PaperWorldConfig {
|
|
|
|
log("Warning: This feature may help reduce TPS loss from light, but comes at the cost of buggy light data");
|
|
|
|
log("We are working to improve this feature.");
|
2016-03-16 07:21:39 +00:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ 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
|
2018-12-17 05:18:06 +00:00
|
|
|
index d0d93b1eb..2804bfc0a 100644
|
2016-03-16 07:21:39 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
2018-08-26 18:11:49 +00:00
|
|
|
@@ -61,7 +61,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
2018-12-17 05:18:06 +00:00
|
|
|
private long cu = SystemUtils.getMonotonicMillis();
|
|
|
|
private Entity spectatedEntity;
|
2017-05-14 18:05:01 +00:00
|
|
|
public boolean worldChangeInvuln;
|
2018-08-26 18:11:49 +00:00
|
|
|
- private boolean cx;
|
|
|
|
+ private boolean cx; private void setHasSeenCredits(boolean has) { this.cx = has; } // Paper - OBFHELPER
|
2018-12-17 05:18:06 +00:00
|
|
|
private final RecipeBookServer recipeBook;
|
2018-08-26 18:11:49 +00:00
|
|
|
private Vec3D cz;
|
|
|
|
private int cA;
|
2018-11-03 00:23:27 +00:00
|
|
|
@@ -649,6 +649,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
2016-03-16 07:21:39 +00:00
|
|
|
this.world.kill(this);
|
|
|
|
if (!this.viewingCredits) {
|
|
|
|
this.viewingCredits = true;
|
2017-05-14 18:05:01 +00:00
|
|
|
+ if (world.paperConfig.disableEndCredits) this.setHasSeenCredits(true); // Paper - Toggle to always disable end credits
|
2018-08-26 18:11:49 +00:00
|
|
|
this.playerConnection.sendPacket(new PacketPlayOutGameStateChange(4, this.cx ? 0.0F : 1.0F));
|
|
|
|
this.cx = true;
|
2017-05-14 18:05:01 +00:00
|
|
|
}
|
2016-03-16 07:21:39 +00:00
|
|
|
--
|
2018-12-17 05:18:06 +00:00
|
|
|
2.20.0
|
2016-03-16 07:21:39 +00:00
|
|
|
|