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

Updated Upstream (Paper & Tuinity)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
6e7dc3f81 [Auto] Updated Upstream (CraftBukkit)
664ae4554 [Auto] Updated Upstream (CraftBukkit)
dafc7b8f8 Fix off by one error for scheduling block ticks (#4014)
5791e512b Fix MaterialTags tests to actually pass
115972651 Expand MaterialTags v2 (#4009)
5aaf1c514 prevent path space splitting in testServer.sh (#4007)
a8ef09b82 Tighten logic for handling target tick times in tick scheduler (#4010)
d5ccd4139 Remove ability to disable async chunks unless single core cpu
76728529f Fix Light Prioritization Issues
2d66b5be8 [Auto] Updated Upstream (CraftBukkit)
51d10c201 Add missing strikeLighting call to World#spigot()#strikeLightningEffect

Tuinity Changes:
416ed5e Fix 3 tick pistons not functioning correctly
489faf0 Fix up lock handling for UserCache
This commit is contained in:
William Blake Galbreath
2020-07-28 12:51:43 -05:00
parent 331571119c
commit fe05292d11
9 changed files with 84 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0047-Cat-spawning-options.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Cat spawning options
diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
index dfa8f3439..a3a073f9d 100644
index dfa8f3439b..a3a073f9d2 100644
--- a/src/main/java/net/minecraft/server/IEntityAccess.java
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
@@ -45,6 +45,7 @@ public interface IEntityAccess {
@@ -17,7 +17,7 @@ index dfa8f3439..a3a073f9d 100644
return this.a(oclass, axisalignedbb, IEntitySelector.g);
}
diff --git a/src/main/java/net/minecraft/server/MobSpawnerCat.java b/src/main/java/net/minecraft/server/MobSpawnerCat.java
index 67c20747a..68d37121f 100644
index 67c20747a3..68d37121fd 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerCat.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerCat.java
@@ -16,7 +16,7 @@ public class MobSpawnerCat implements MobSpawner {
@@ -66,7 +66,7 @@ index 67c20747a..68d37121f 100644
}
diff --git a/src/main/java/net/minecraft/server/VillagePlace.java b/src/main/java/net/minecraft/server/VillagePlace.java
index c1e149f20..acc30cb0d 100644
index c1e149f204..acc30cb0d8 100644
--- a/src/main/java/net/minecraft/server/VillagePlace.java
+++ b/src/main/java/net/minecraft/server/VillagePlace.java
@@ -45,6 +45,7 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
@@ -78,7 +78,7 @@ index c1e149f20..acc30cb0d 100644
return this.c(predicate, blockposition, i, villageplace_occupancy).count();
}
diff --git a/src/main/java/net/minecraft/server/VillagePlaceType.java b/src/main/java/net/minecraft/server/VillagePlaceType.java
index 5bd3bcc2b..5f2bb140a 100644
index 5bd3bcc2b9..5f2bb140ae 100644
--- a/src/main/java/net/minecraft/server/VillagePlaceType.java
+++ b/src/main/java/net/minecraft/server/VillagePlaceType.java
@@ -44,7 +44,7 @@ public class VillagePlaceType {
@@ -99,10 +99,10 @@ index 5bd3bcc2b..5f2bb140a 100644
return this.E;
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 596ef231c..edd76575a 100644
index 346cbc3efd..88e807da1e 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -2500,6 +2500,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -2502,6 +2502,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
}
}
@@ -111,7 +111,7 @@ index 596ef231c..edd76575a 100644
return this.getChunkProvider().j();
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b41d4959c..55e609cc1 100644
index b41d4959c1..55e609cc1c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -111,6 +111,15 @@ public class PurpurWorldConfig {