Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Preliminary update to 1.17.1

Browse Source
This commit is contained in:
William Blake Galbreath
2021-07-06 16:25:46 -05:00
parent 89c9c902b1
commit 471d6bf4c1
202 changed files with 994 additions and 20192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/server/0114-Configurable-daylight-cycle.patch
View File

@@ -18,26 +18,26 @@ index 689ad22925b2561f7c8db961743eb1f821dbb25f..fa3c960992cc240161817e54659d83fe
public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) {
this.gameTime = time % 192000; // Paper - fix guardian beam
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 7620030f795604c49596ce972c0b39438341e4df..276fb2b9fc9d33dc2157903e799178168c69bc88 100644
index dd8248b89ee8694a18fffc4d880c92038d725cf7..9abc5063efe95a48a70045d8cedc15ab245ee65c 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -201,6 +201,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
final Int2ObjectMap<EnderDragonPart> dragonParts;
@@ -200,6 +200,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
private final StructureFeatureManager structureFeatureManager;
private final boolean tickTime;
+ private double fakeTime; // Purpur
// Tuinity start - execute chunk tasks mid tick
public long lastMidTickExecuteFailure;
// Tuinity end - execute chunk tasks mid tick
@@ -578,6 +579,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
// CraftBukkit start
private int tickPosition;
@@ -408,6 +409,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
this.asyncChunkTaskManager = new com.destroystokyo.paper.io.chunk.ChunkTaskManager(this); // Paper
+ this.fakeTime = this.serverLevelData.getDayTime(); // Purpur
}
// Tuinity start - optimise collision
@@ -869,6 +871,18 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
// CraftBukkit start
@@ -687,6 +689,18 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
this.liquidTicks.nextTick(); // Paper
this.serverLevelData.getScheduledEvents().tick(this.server, i);
if (this.levelData.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) {
@@ -56,7 +56,7 @@ index 7620030f795604c49596ce972c0b39438341e4df..276fb2b9fc9d33dc2157903e79917816
this.setDayTime(this.levelData.getDayTime() + 1L);
}
@@ -877,6 +891,12 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
@@ -695,6 +709,12 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
public void setDayTime(long timeOfDay) {
this.serverLevelData.setDayTime(timeOfDay);
@@ -70,10 +70,10 @@ index 7620030f795604c49596ce972c0b39438341e4df..276fb2b9fc9d33dc2157903e79917816
public void tickCustomSpawners(boolean spawnMonsters, boolean spawnAnimals) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index cddccb3329be99ce11ea30b651184fb9eea243b3..b91e2bda59fa82ab0d86f70a6d0185ae76126772 100644
index 21d3acb8a69fffd372af6cd1fc667feb91a3a4dc..a2e9ed180930e3f20b4973f2082d4b336e2719a1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -104,6 +104,13 @@ public class PurpurWorldConfig {
@@ -103,6 +103,13 @@ public class PurpurWorldConfig {
armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
}