mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-30 16:19:03 +01:00
dd60ba4869
The lighting queue spreads out the processing of light updates across multiple ticks based on how much free time the server has left at the end of the tick.
54 lines
No EOL
2.5 KiB
Diff
54 lines
No EOL
2.5 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
return this.world.pvpMode;
|
|
}
|
|
|
|
+ /**
|
|
+ * Paper - Give "theEnd2" achievement if the player doesn't already have it
|
|
+ */
|
|
+ private void giveTheEnd2() {
|
|
+ if (!this.a(AchievementList.D)) {
|
|
+ this.b(AchievementList.D);
|
|
+ }
|
|
+ }
|
|
+
|
|
public Entity c(int i) {
|
|
//this.cj = true; // CraftBukkit - Moved down and into PlayerList#changeDimension
|
|
if (this.dimension == 1 && i == 1) {
|
|
@@ -0,0 +0,0 @@ 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);
|
|
--
|