Upstream
/
Yatopia
mirror of https://github.com/YatopiaMC/Yatopia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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:
adfab32 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.4
1d4c8fc Updated Upstream (Paper)
48ccd32 Do not retain playerchunkmap instance in light thread factory

Purpur Changes:
4a95a55 Updated Upstream (Paper & Tuinity)
4ba69a2 Add tablist suffix option for afk
28437fe Merge branch 'ver/1.16.4' of github.com:pl3xgaming/Purpur into ver/1.16.4
5796ff9 Updated Upstream (Paper)
d98da39 Update README
b85092b Disable doclint on javadoc generation
ef45666 Updated Upstream (Paper)
This commit is contained in:
Ivan Pekov 2020-11-13 10:32:37 +02:00
parent ca7aabbb2f
commit 8fbaee0090
No known key found for this signature in database
GPG Key ID: BC975C392D9CA3A3
8 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Purpur

@ -1 +1 @@
Subproject commit a295636d230d1f34d2f43b429540bcd0b144e547
Subproject commit 4a95a5522584edd5a7f68bb054000c99840805b2

2
Tuinity

@ -1 +1 @@
Subproject commit ee5df4c7d489324d84fcdbf89eeac60cad12c9d6
Subproject commit adfab32e364ec0f6adfb3c2b4d989dcd43dc1bb5

2
patches/server/0001-Yatopia-Server-Fixes.patch
View File

@ -1045,7 +1045,7 @@ index f5c0ccfcbfeda191e3a077bb4313a8c8b8b4178d..00000000000000000000000000000000
- PlayerTeleportEvent tpEvent = new PlayerTeleportEvent(this.getBukkitEntity(), enter, exit, cause);
- Bukkit.getServer().getPluginManager().callEvent(tpEvent);
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 7f75be31cba2e3c97afad94c3c7d8196bb468040..559edd9df30c700806b829aa0e09453e0e289319 100644
index a02f54ab3ac721a5697f8efea474d2999a0fd7bd..9dc054e2e189f8c65a9d12f70e180e7ded79a997 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -92,6 +92,13 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

4
patches/server/0003-Brandings.patch
View File

@ -181,10 +181,10 @@ index 62012d2b780d3399bd641ca3ca4a4ac127e3bcb5..71159c8ad99e46eded68c0cebd0090d1
//Thread.sleep(TimeUnit.SECONDS.toMillis(20));
// Paper End
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index ed926fc6ebbabd50a73d216a9e018a9427f5b128..f2c4b46ebe5c2f954a864645c91ec0cafe23dbbc 100644
index 0f7f1503d07bdff7ce7644dfe21e444adb52c7db..edc01c66220c390b844cfb37c26ad77f60885c51 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -347,7 +347,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -353,7 +353,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {

4
patches/server/0011-Modify-default-configs.patch
View File

@ -18,10 +18,10 @@ index 6ab0a51b421dc696aec292f2db955311c9cc31e3..82591dcebdbf34649728b60b22d8f78a
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 4aacf8a5b2e98b0f8c1e27569ff7591fee32c725..f64da7db530aeeadac06a09f514c5fbf70f20683 100644
index 9a0ade5875c34487a65f82f9380f9d25b4432586..8377af6c217a060e0e9178f11a92ca6a6014316c 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -591,7 +591,7 @@ public class PaperWorldConfig {
@@ -592,7 +592,7 @@ public class PaperWorldConfig {
}
public boolean cooldownHopperWhenFull = true;

6
patches/server/0019-Option-for-simpler-Villagers.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Option for simpler Villagers
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 559edd9df30c700806b829aa0e09453e0e289319..8478702a7035ef256e15722727d765cab6069eca 100644
index 9dc054e2e189f8c65a9d12f70e180e7ded79a997..d009c30e47e5419ae20af1a628d01a94942af758 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -31,6 +31,7 @@ import org.bukkit.event.entity.VillagerReplenishTradeEvent;
@ -136,7 +136,7 @@ index 559edd9df30c700806b829aa0e09453e0e289319..8478702a7035ef256e15722727d765ca
private void fo() {
int i = 2 - this.bD;
@@ -596,6 +671,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -598,6 +673,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
}
private void a(Entity entity) {
@ -144,7 +144,7 @@ index 559edd9df30c700806b829aa0e09453e0e289319..8478702a7035ef256e15722727d765ca
if (this.world instanceof WorldServer) {
Optional<List<EntityLiving>> optional = this.bg.getMemory(MemoryModuleType.VISIBLE_MOBS);
@@ -612,6 +688,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -614,6 +690,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
}
public void a(MemoryModuleType<GlobalPos> memorymoduletype) {

6
patches/server/0035-lithium-collision-optimizations.patch
View File

@ -1065,10 +1065,10 @@ index 40ca3364d462dc7b5a4c1f8f353c758a421656bf..7657d13dd7556e4c32088bbe5735df52
default EntityHuman findNearbyPlayer(Entity entity, double d0, @Nullable Predicate<Entity> predicate) { return this.findNearbyPlayer(entity.locX(), entity.locY(), entity.locZ(), d0, predicate); } // Paper
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index 2c7ee012a7ae9ee8c269bb469282202f2a846ebf..51a19bce92c801912030699def8534213d77d310 100644
index f10a135f87a2383fe10ff34bda685cf4784081e9..52e064b67d984930d778333c5e8977b5d17c3cab 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -1363,11 +1363,11 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -1364,11 +1364,11 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
chunk.setLoaded(true);
this.world.a(chunk.getTileEntities().values());
List<Entity> list = null;
@ -1082,7 +1082,7 @@ index 2c7ee012a7ae9ee8c269bb469282202f2a846ebf..51a19bce92c801912030699def853421
Iterator iterator = entityslice.iterator();
while (iterator.hasNext()) {
@@ -1648,7 +1648,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -1649,7 +1649,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
// CraftBukkit - decompile error
csvwriter.a(chunkcoordintpair.x, chunkcoordintpair.z, playerchunk.getTicketLevel(), optional.isPresent(), optional.map(IChunkAccess::getChunkStatus).orElse(null), optional1.map(Chunk::getState).orElse(null), a(playerchunk.c()), a(playerchunk.a()), a(playerchunk.b()), this.chunkDistanceManager.c(entry.getLongKey()), !this.isOutsideOfRange(chunkcoordintpair), optional1.map((chunk) -> {

12
patches/server/0063-Optimize-advancement-loading.patch
View File

@ -18,10 +18,10 @@ index c405047c00d354bbc1449fd2f917b73f980ef1a5..8b31098032dc7a08d201e20c917f2734
return this.rewards;
}
diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
index 17789407b9e86896a963a305a13357286aa5f319..30e5220770f813a28c4c9bdf5d90592e4f12dc68 100644
index c680319e4040be2b60795b22a5e65d6444cc67ed..18e80feae122f9b90e61b66e0f660d15585fe3bb 100644
--- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
+++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
@@ -159,11 +159,16 @@ public class AdvancementDataPlayer {
@@ -160,11 +160,16 @@ public class AdvancementDataPlayer {
throw new JsonParseException("Found null for advancements");
}
@ -38,7 +38,7 @@ index 17789407b9e86896a963a305a13357286aa5f319..30e5220770f813a28c4c9bdf5d90592e
Advancement advancement = advancementdataworld.a((MinecraftKey) entry.getKey());
if (advancement == null) {
@@ -200,11 +205,37 @@ public class AdvancementDataPlayer {
@@ -201,11 +206,37 @@ public class AdvancementDataPlayer {
}
}
@ -76,7 +76,7 @@ index 17789407b9e86896a963a305a13357286aa5f319..30e5220770f813a28c4c9bdf5d90592e
public void b() {
if (org.spigotmc.SpigotConfig.disableAdvancementSaving) return; // Spigot
Map<MinecraftKey, AdvancementProgress> map = Maps.newHashMap();
@@ -329,6 +360,11 @@ public class AdvancementDataPlayer {
@@ -330,6 +361,11 @@ public class AdvancementDataPlayer {
AdvancementProgress advancementprogress = this.getProgress(advancement);
if (!advancementprogress.isDone()) {
@ -88,7 +88,7 @@ index 17789407b9e86896a963a305a13357286aa5f319..30e5220770f813a28c4c9bdf5d90592e
Iterator iterator = advancement.getCriteria().entrySet().iterator();
while (iterator.hasNext()) {
@@ -348,7 +384,7 @@ public class AdvancementDataPlayer {
@@ -349,7 +385,7 @@ public class AdvancementDataPlayer {
}
}
@ -97,7 +97,7 @@ index 17789407b9e86896a963a305a13357286aa5f319..30e5220770f813a28c4c9bdf5d90592e
}
private void d(Advancement advancement) {
@@ -442,6 +478,7 @@ public class AdvancementDataPlayer {
@@ -444,6 +480,7 @@ public class AdvancementDataPlayer {
this.data.put(advancement, advancementprogress);
}