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

Updated Upstream (Paper)

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

Paper Changes:
1daafe455 Updated Upstream (Bukkit/CraftBukkit)
98828b006 Merge pull request #4132 from Proximyst/progress/1.16.2
b23f27f8d  Fix incorrect return for WorldServer#addAllEntitiesSafely (#3)
5085fa30c Fix MC-187716 Use configured height
c44add5a0 Initialise a new chunk section if none was found yet updated
74a4d5f8b Remove armour stand double add to world
6d25cc4ec Don't mark null chunk sections for block updates
This commit is contained in:
William Blake Galbreath
2020-08-16 09:32:41 -05:00
parent 38c21107af
commit 6b4bc4775d
18 changed files with 184 additions and 281 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 90c37e4a8..7a42feb16 100644
index 90c37e4a8e..7a42feb16e 100644
--- a/src/main/java/net/minecraft/server/IEntityAccess.java
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
@@ -44,6 +44,7 @@ public interface IEntityAccess {
@@ -17,7 +17,7 @@ index 90c37e4a8..7a42feb16 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 5e17868a7..6d0ebd8af 100644
index 5e17868a76..6d0ebd8afe 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 {
@@ -62,7 +62,7 @@ index 5e17868a7..6d0ebd8af 100644
}
diff --git a/src/main/java/net/minecraft/server/VillagePlace.java b/src/main/java/net/minecraft/server/VillagePlace.java
index adacfce6f..21e401acd 100644
index adacfce6f3..21e401acd7 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> {
@@ -74,7 +74,7 @@ index adacfce6f..21e401acd 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 a5718af9b..b6b4c8c49 100644
index a5718af9b6..b6b4c8c491 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 {
@@ -95,10 +95,10 @@ index a5718af9b..b6b4c8c49 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 699a03a9e..004cc8616 100644
index b0b49c866c..72958601e6 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -2530,6 +2530,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -2534,6 +2534,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
}
}
@@ -107,7 +107,7 @@ index 699a03a9e..004cc8616 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 {