18b4817a33
Use -1 to represent vanilla/unlimited. Updated PaperWorldConfig to also update the individual worlds limit if it was set to the new default value. Should hopefully help #235
57 lines
2.3 KiB
Diff
57 lines
2.3 KiB
Diff
From bbd9db10725d0e0bfb9ed3bd9252636585728e72 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 158db3a..e4e5487 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -164,4 +164,10 @@ public class PaperWorldConfig {
|
|
queueLightUpdates = getBoolean("queue-light-updates", false);
|
|
log("Lighting Queue enabled: " + queueLightUpdates);
|
|
}
|
|
+
|
|
+ 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 a54f09c..48376e8 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
@@ -504,6 +504,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
return this.world.pvpMode;
|
|
}
|
|
|
|
+
|
|
+ // Paper start - Give "theEnd2" achievement if the player doesn't already have it
|
|
+ private void giveTheEnd2() {
|
|
+ if (!this.a(AchievementList.D)) {
|
|
+ this.b(AchievementList.D);
|
|
+ }
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Nullable
|
|
public Entity c(int i) {
|
|
//this.ck = true; // CraftBukkit - Moved down and into PlayerList#changeDimension
|
|
@@ -512,7 +521,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
this.world.kill(this);
|
|
if (!this.viewingCredits) {
|
|
this.viewingCredits = true;
|
|
- if (this.a(AchievementList.D)) {
|
|
+ // Paper start - Allow configurable end portal credits
|
|
+ if (world.paperConfig.disableEndCredits || this.a(AchievementList.D)) {
|
|
+ this.giveTheEnd2();
|
|
+ // Paper end
|
|
this.playerConnection.sendPacket(new PacketPlayOutGameStateChange(4, 0.0F));
|
|
} else {
|
|
this.b((Statistic) AchievementList.D);
|
|
--
|
|
2.8.2
|
|
|