Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2025-01-24 00:51:21 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream and Sidestream(s) (Tuinity/Origami/Purpur)

Browse Source 
Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Tuinity Changes:
cff9ec0 Updated Upstream (Paper)
c3d5d24 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.3
5df4a4f Reset the minimum ticket level for delaying unloads (#196)

Origami Changes:
23fe2d3 Remove unnecessary map patch. Fixed in Paper
faef256 Remove unused stream removal change
3f68c85 Update Paper

Purpur Changes:
1720664 Updated Upstream (Tuinity)
6b2b137 Updated Upstream (Paper)
afed247 Updated Upstream (Paper)
a8a4826 Updated Upstream (Paper)
ca4c502 Updated Upstream (Paper)
686ac09 Updated Upstream (Paper)
49dc495 Allow infinite and mending enchantments together
This commit is contained in:
Ivan Pekov 2020-10-18 15:19:38 +03:00
parent 9aa38226e4
commit ab272cc991
No known key found for this signature in database
GPG Key ID: BC975C392D9CA3A3
11 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Origami

@ -1 +1 @@
Subproject commit 7e2a3f6ddd399c7c8c0f9e52515ef2f921913070
Subproject commit 23fe2d36fd6b948334f60316d2cb541f8f915a82

2
Purpur

@ -1 +1 @@
Subproject commit ea7a301947a7256c52f99696a29c78fb7997004c
Subproject commit 17206646c6477198c324054e40d824d6485b3367

2
Tuinity

@ -1 +1 @@
Subproject commit 988e5501fb06ada7fd9dad5bf813d3578c072988
Subproject commit cff9ec06adcc1bfafef3ad91c06b093d467ec461

2
patches/api/0002-Modify-POM.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Modify POM
diff --git a/pom.xml b/pom.xml
index 3b5dcb434f3357183859281941139a1c86d9cb1b..84284073f5d236c9a2e2b381f448fa30933cf87d 100644
index c4168709ba17bc455c31acc9f61ee68bf847f207..39a68715d66001c25627af4898f31cd97d94f097 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,18 @@

2
patches/api/0004-Add-GameProfileLookupEvent.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add GameProfileLookupEvent
diff --git a/pom.xml b/pom.xml
index 84284073f5d236c9a2e2b381f448fa30933cf87d..c1155ea1f455ddd01da7f84195e3e1db788f76c0 100644
index 39a68715d66001c25627af4898f31cd97d94f097..3d14551ab545538b74379a20c92b2dfa40c4b3cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,10 @@

2
patches/api/0006-Add-NBT-API-as-a-first-class-lib.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add NBT API as a first-class lib
diff --git a/pom.xml b/pom.xml
index c1155ea1f455ddd01da7f84195e3e1db788f76c0..4aa457af0e9e809359a7934ccfce14e33f3f1da7 100644
index 3d14551ab545538b74379a20c92b2dfa40c4b3cc..76fd6aa370aab8f18f2b12a5ca1f69bf8c67aace 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,11 @@

2
patches/server/0002-Modify-POM.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Modify POM
diff --git a/pom.xml b/pom.xml
index 5e25ae55e44e31d232b088b7c3c39df69b0cc875..7e1c319897728af0943a5ce71f7220d97f0a7153 100644
index e5b74fbf25b1e537aa9f6490b75a74106b4aa888..2a77cf53a684535e8331989d252660055d01755d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,11 @@

2
patches/server/0009-Add-NBT-API-as-a-first-class-lib.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add NBT API as a first-class lib
diff --git a/pom.xml b/pom.xml
index 7e1c319897728af0943a5ce71f7220d97f0a7153..4e9dfd79751fbf5c926c9683a2c8bb2800c60f0c 100644
index 2a77cf53a684535e8331989d252660055d01755d..fd15e54ea87581c61566b7ed4620435fac579bab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -321,6 +321,10 @@

6
patches/server/0010-Modify-default-configs.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Modify default configs
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index e14d71d60c3433c39dcf217d48bd667b2c2b49e1..f5018d232372a40de4d26293faaafcd7ccde627f 100644
index 053da5119404ded5e3cf6bb55967cc8ffba47de6..b1f1df3862455f2d1566a215bca9fc7ca7006118 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -201,7 +201,7 @@ public class PaperConfig {
@ -18,10 +18,10 @@ index e14d71d60c3433c39dcf217d48bd667b2c2b49e1..f5018d232372a40de4d26293faaafcd7
TimingsManager.privacy = getBoolean("timings.server-name-privacy", false);
TimingsManager.hiddenConfigs = getList("timings.hidden-config-entries", Lists.newArrayList("database", "settings.bungeecord-addresses"));
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index fbfea9e981bdc90d679d315b5e75ba01d3d396a0..84827312d66da1028ba90a81eeae0411a96d1284 100644
index 26287b3e4007c02b9d78d60453fa16d3cfaae638..b32002c1aa40648fb4732a368f8ff0f345fcda9b 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -589,7 +589,7 @@ public class PaperWorldConfig {
@@ -591,7 +591,7 @@ public class PaperWorldConfig {
}
public boolean cooldownHopperWhenFull = true;

8
patches/server/0034-lithium-collision-optimizations.patch
View File

@ -772,7 +772,7 @@ index 0000000000000000000000000000000000000000..493103d755c222f2c6031ffb8f5c0b7a
+ Collection<T> getAllOfGroupType(EntityClassGroup type);
+}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index ac6e5e3309affc830d4db07fd9b8d809c3085033..b7fcbef8d38c9406a891d64f8016bc16572f00d9 100644
index 018972007c7c36f96102ff22423dc7c45369eaa0..450d5fabba6cbcc3443f049b2e980b316a2598c0 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -36,7 +36,7 @@ public class Chunk implements IChunkAccess {
@ -802,7 +802,7 @@ index ac6e5e3309affc830d4db07fd9b8d809c3085033..b7fcbef8d38c9406a891d64f8016bc16
}
this.d = biomestorage;
@@ -615,8 +615,8 @@ public class Chunk implements IChunkAccess {
@@ -618,8 +618,8 @@ public class Chunk implements IChunkAccess {
k = this.entitySlices.length - 1;
}
// Paper - remove from any old list if its in one
@ -813,7 +813,7 @@ index ac6e5e3309affc830d4db07fd9b8d809c3085033..b7fcbef8d38c9406a891d64f8016bc16
if (nextSlice == currentSlice) {
if (World.DEBUG_ENTITIES) MinecraftServer.LOGGER.warn("Entity was already in this chunk!" + entity, new Throwable());
return; // ??? silly plugins
@@ -930,12 +930,12 @@ public class Chunk implements IChunkAccess {
@@ -933,12 +933,12 @@ public class Chunk implements IChunkAccess {
j = MathHelper.clamp(j, 0, this.entitySlices.length - 1);
for (int k = i; k <= j; ++k) {
@ -830,7 +830,7 @@ index ac6e5e3309affc830d4db07fd9b8d809c3085033..b7fcbef8d38c9406a891d64f8016bc16
if (entity1.shouldBeRemoved) continue; // Paper
if (entity1.getBoundingBox().c(axisalignedbb) && entity1 != entity) {
@@ -1067,8 +1067,16 @@ public class Chunk implements IChunkAccess {
@@ -1070,8 +1070,16 @@ public class Chunk implements IChunkAccess {
}
public List<Entity>[] getEntitySlices() { // Spigot

15
patches/server/0063-Replace-some-hot-streams.patch
View File

@ -5,20 +5,19 @@ Subject: [PATCH] Replace some hot streams
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 24a6102b37b7e6b4ed208f803d646645dcafe1c3..422b5f0c28d85ee167bce2967e1b5ee9fa7833dd 100644
index 1bc8b11d999e9af16a44fe1cb62f5785afa82462..257745d56e54cc8442be97b475d84e7f3991ebf5 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -416,10 +416,21 @@ public class ChunkRegionLoader {
NBTTagCompound nbttagcompound2;
@@ -430,9 +430,20 @@ public class ChunkRegionLoader {
for (int i = -1; i < 17; ++i) { // Paper - conflict on loop parameter change
int finalI = i; // CraftBukkit - decompile errors
+ // Yatopia start - replace stream
+ /*
int finalI = i;
ChunkSection chunksection = (ChunkSection) Arrays.stream(achunksection).filter((chunksection1) -> {
return chunksection1 != null && chunksection1.getYPosition() >> 4 == finalI;
return chunksection1 != null && chunksection1.getYPosition() >> 4 == finalI; // CraftBukkit - decompile errors
}).findFirst().orElse(Chunk.a);
+ */
+ */
+ ChunkSection chunksection = Chunk.EMPTY_CHUNK_SECTION;
+ for (ChunkSection section : achunksection) {
+ if (section != null && section.getYPosition() >> 4 == i) {
@ -30,7 +29,7 @@ index 24a6102b37b7e6b4ed208f803d646645dcafe1c3..422b5f0c28d85ee167bce2967e1b5ee9
// Paper start - async chunk save for unload
NibbleArray nibblearray; // block light
NibbleArray nibblearray1; // sky light
@@ -706,6 +717,8 @@ public class ChunkRegionLoader {
@@ -725,6 +736,8 @@ public class ChunkRegionLoader {
while (iterator.hasNext()) {
String s = (String) iterator.next();
@ -39,7 +38,7 @@ index 24a6102b37b7e6b4ed208f803d646645dcafe1c3..422b5f0c28d85ee167bce2967e1b5ee9
map.put(StructureGenerator.a.get(s.toLowerCase(Locale.ROOT)), new LongOpenHashSet(Arrays.stream(nbttagcompound1.getLongArray(s)).filter((i) -> {
ChunkCoordIntPair chunkcoordintpair1 = new ChunkCoordIntPair(i);
@@ -716,6 +729,22 @@ public class ChunkRegionLoader {
@@ -735,6 +748,22 @@ public class ChunkRegionLoader {
return true;
}
}).toArray()));