Skip to content

Commit

Permalink
Updated Upstream (Purpur)
Browse files Browse the repository at this point in the history
Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@39bdf3d Updated Upstream (Paper)
  • Loading branch information
MrFishCakes committed Sep 11, 2023
1 parent 35ed266 commit 9782b52
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
group = org.graphitemc.graphite
version = 1.20.1-R0.1-SNAPSHOT

purpurCommit = 671c31a78762994ead0b11a46e0257d6b9fafd0e
purpurCommit = 39bdf3d2e045857f328bd628f785c54be951e9bd

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
6 changes: 3 additions & 3 deletions patches/server/0001-Graphite-Rebrand.patch
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,10 @@ index b5b6657e52e4f7a630229bd3ba433438af293e22..75a47c253ba2adcc19d91a5f990ff876

public String getTitle() {
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index bdb32964524cb2a4398b8d3bedfb03b0cb805b6d..8f770b6d252f2ef6e8dc63c0093012978de565dc 100644
index 80ab17142c34d576409e5fb353ff31db9673b2c0..41b1abbd8a395f16ad20a425640b33ae27e07a83 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -1035,7 +1035,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1034,7 +1034,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
TickingBlockEntity tickingblockentity = (TickingBlockEntity) this.blockEntityTickers.get(tileTickPosition);
// Spigot start
if (tickingblockentity == null) {
Expand Down Expand Up @@ -162,7 +162,7 @@ index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..65dc12643d7533cbfa4813ce38baf353

if (stream != null) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 3029f38cff6755b31427efb7fae3b6886ee8e4ee..2ce85ffaa3533c0e37a41c8a35cb0c7d1e055ccf 100644
index 3633574e112f217b412217dd243a631dc4e9c40c..6c952d04ebcc08afc933475661c673d975a43862 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -231,7 +231,7 @@ public class PurpurConfig {
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0002-Graphite-Configuration.patch
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ index 221d1d0e1b4b46de6ebca5faac09bbda875fae17..c6b9451b60f117ef6d6cb5f63d9d5b57
this.convertable = convertable_conversionsession;
this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile());
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 8f770b6d252f2ef6e8dc63c0093012978de565dc..b1a32fbfc51e4daa1ea36a4482c42ceb7617b418 100644
index 41b1abbd8a395f16ad20a425640b33ae27e07a83..b2b2382162f03d35e6319fc0cb80d205fb754a51 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -328,9 +328,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
Expand All @@ -277,7 +277,7 @@ index 8f770b6d252f2ef6e8dc63c0093012978de565dc..b1a32fbfc51e4daa1ea36a4482c42ceb
this.purpurConfig = new org.purpurmc.purpur.PurpurWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), env); // Purpur
this.playerBreedingCooldowns = this.getNewBreedingCooldownCache(); // Purpur
this.generator = gen;
@@ -1630,4 +1631,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1629,4 +1630,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
return getWorld().getEnvironment() == org.bukkit.World.Environment.THE_END;
}
// Purpur end
Expand Down

0 comments on commit 9782b52

Please sign in to comment.