Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2024-11-22 10:35:42 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream and Sidestream(s) (Tuinity/EMC/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:
53d9870 Updated Upstream (Paper)

EMC Changes:
541b7328 Updated Paper

Origami Changes:
14a141e Update Paper

Purpur Changes:
17e9e39 Fix short enderman height - EntityTypes now loads before configs
8bfb9f5 Updated Upstream (Paper)
885092f Updated Upstream (Paper)
e126e38 Fix villager boat exploit
This commit is contained in:
Ivan Pekov 2021-01-13 08:17:16 +02:00
parent 60fd6b7aa5
commit 86c42a4fe1
No known key found for this signature in database
GPG Key ID: BC975C392D9CA3A3
11 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Empirecraft

@ -1 +1 @@
Subproject commit a841b5a54e163bd6c9e1f9ab3c1d7876b932521f
Subproject commit 541b73285e0206794d1bac040a8c6a6ffc92b400

2
Origami

@ -1 +1 @@
Subproject commit 2cff647f8537ebee911d8bcd52c70e3fc1cb5677
Subproject commit 14a141e585046f29dca4d672b04d77736e810c3a

2
Purpur

@ -1 +1 @@
Subproject commit 475b2325618cf556c8d0184090e3ea31a8f3bcb5
Subproject commit 17e9e393700920bfa43e8437f0427c1c394b50dc

2
Tuinity

@ -1 +1 @@
Subproject commit 683b91397dd2c2cdc8164b0f2a26e1d8963268ce
Subproject commit 53d98709f8abd035090bd4fedeb838a2939ebbdb

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

@ -420,7 +420,7 @@ index dd52a8fe4fd46e57a5d1af49ba1965a483cf4fcc..00000000000000000000000000000000
- IChunkAccess ichunkaccess = iworldreader.getChunkAt(chunkcoordintpair.x, chunkcoordintpair.z, ChunkStatus.STRUCTURE_STARTS, !(iworldreader instanceof World) || !((World) iworldreader).origamiConfig.onlyFindGeneratedFeatures);
- if (ichunkaccess == null) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 1ab3d205ae20a9674ee3d13c42fd7bc3c52e5503..af65e7fd2c3acac2627452f030bc973f8ad3ff54 100644
index d0924d78a33f397b9c334f363e6f239c5e5f85a0..2cdfcec68ee66915ea72cccded5f1a2d50c04c30 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -96,6 +96,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@ -600,7 +600,7 @@ index 750637ecdd44dacac2b7c83a1701d795309d5583..081dc7a2a4a5d80da868b1080b212ddc
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java.rej b/src/main/java/net/pl3x/purpur/PurpurConfig.java.rej
deleted file mode 100644
index ccee2c7ae135a3a532f76b44d7d3ad6db7e8c387..0000000000000000000000000000000000000000
index 0635030ba4c1cea7961238bb0c0be39d8c5a7d50..0000000000000000000000000000000000000000
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java.rej
+++ /dev/null
@@ -1,27 +0,0 @@
@ -611,9 +611,9 @@ index ccee2c7ae135a3a532f76b44d7d3ad6db7e8c387..00000000000000000000000000000000
- import co.aikar.timings.TimingsManager;
-+import com.destroystokyo.paper.PaperConfig;
- import com.google.common.base.Throwables;
- import net.minecraft.server.MinecraftServer;
- import net.pl3x.purpur.command.PurpurCommand;
-@@ -130,6 +131,17 @@ public class PurpurConfig {
- import net.minecraft.server.EntitySize;
- import net.minecraft.server.EntityTypes;
-@@ -132,6 +133,17 @@ public class PurpurConfig {
- return config.getString(path, config.getString(path));
- }
-

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

@ -104,7 +104,7 @@ index 001b1e5197eaa51bfff9031aa6c69876c9a47960..bd5d7508b1c44fba776c5d7fa4454ff5
if (stream != null) {
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
index 4d310908489953d6d061b2358f614142edacb62e..121e7cd534558dcc249fb9a3bffbd22fb436fba5 100644
index 58d01c6f8abcd9e1792495abd08b186f9d03f834..476939bde38246eb0fd96e6a4ba8076c9d1b0ff4 100644
--- a/src/main/java/org/spigotmc/WatchdogThread.java
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
@@ -26,7 +26,7 @@ public class WatchdogThread extends Thread
@ -116,7 +116,7 @@ index 4d310908489953d6d061b2358f614142edacb62e..121e7cd534558dcc249fb9a3bffbd22f
this.timeoutTime = timeoutTime;
this.restart = restart;
earlyWarningEvery = Math.min(PaperConfig.watchdogPrintEarlyWarningEvery, timeoutTime); // Paper
@@ -158,14 +158,14 @@ public class WatchdogThread extends Thread
@@ -162,14 +162,14 @@ public class WatchdogThread extends Thread
if (isLongTimeout) {
// Paper end
log.log( Level.SEVERE, "------------------------------" );
@ -134,7 +134,7 @@ index 4d310908489953d6d061b2358f614142edacb62e..121e7cd534558dcc249fb9a3bffbd22f
//
if ( net.minecraft.server.World.lastPhysicsProblem != null )
{
@@ -188,12 +188,12 @@ public class WatchdogThread extends Thread
@@ -192,12 +192,12 @@ public class WatchdogThread extends Thread
// Paper end
} else
{
@ -149,7 +149,7 @@ index 4d310908489953d6d061b2358f614142edacb62e..121e7cd534558dcc249fb9a3bffbd22f
ChunkTaskManager.dumpAllChunkLoadInfo(); // Paper
this.dumpTickingInfo(); // Tuinity - log detailed tick information
dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( server.serverThread.getId(), Integer.MAX_VALUE ), log );
@@ -209,7 +209,7 @@ public class WatchdogThread extends Thread
@@ -213,7 +213,7 @@ public class WatchdogThread extends Thread
dumpThread( thread, log );
}
} else {

2
patches/server/0007-Yatopia-configuration.patch
View File

@ -67,7 +67,7 @@ index 7034da84c5534d5e1acff645dc9e7d60ddf315fb..b1fa51050ca3deb9a7cfc732d5415010
if (this.isFireProof() || this.world.isClientSide) {
this.extinguish();
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 528072b27060becb37f73fa9b50bac6e3d2b2232..d56ca11a30faeb4f1346b853f50c25f46e3bd49e 100644
index a94f6ed40b9cb5f4b1ac021d9d3ee0d53ea7a40f..67f17d5de8affec750c6c861db48ec4d1558b58b 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -188,7 +188,7 @@ public abstract class PlayerList {

2
patches/server/0020-Optimize-TileEntity-load-unload.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Optimize TileEntity load/unload
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index af65e7fd2c3acac2627452f030bc973f8ad3ff54..be6e09d34977b26961d964ce72ccbc93fb3d21fa 100644
index 2cdfcec68ee66915ea72cccded5f1a2d50c04c30..5759d5e472c089b57ffe9a94c617459ebce77547 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -42,8 +42,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

6
patches/server/0034-Stop-wasting-resources-on-JsonList-get.patch
View File

@ -55,10 +55,10 @@ index 4094ef76b7b05de1bfcc28aa0ef13033abadeb7e..0224a6d0e47e836fa485b39e7b4ce5b8
Throwable throwable = null;
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index d56ca11a30faeb4f1346b853f50c25f46e3bd49e..d52985bc8236ba78b9530b4465e1f6de895f3b72 100644
index 67f17d5de8affec750c6c861db48ec4d1558b58b..0fa95fa3a18c4f0e47c2becd01cf236a3acb4e82 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -638,6 +638,7 @@ public abstract class PlayerList {
@@ -647,6 +647,7 @@ public abstract class PlayerList {
GameProfileBanEntry gameprofilebanentry;
if (getProfileBans().isBanned(gameprofile) && (gameprofilebanentry = getProfileBans().get(gameprofile)) != null) {
// Paper end
@ -66,7 +66,7 @@ index d56ca11a30faeb4f1346b853f50c25f46e3bd49e..d52985bc8236ba78b9530b4465e1f6de
chatmessage = new ChatMessage("multiplayer.disconnect.banned.reason", new Object[]{gameprofilebanentry.getReason()});
if (gameprofilebanentry.getExpires() != null) {
@@ -645,7 +646,11 @@ public abstract class PlayerList {
@@ -654,7 +655,11 @@ public abstract class PlayerList {
}
// return chatmessage;

4
patches/server/0037-Respect-PlayerKickEvent-leaveMessage.patch
View File

@ -39,7 +39,7 @@ index 9d058ddf875e660cb3bd5209e5ddbf1a7abbd04c..63bceb9f1695ce4db5b932ca627d9445
this.minecraftServer.getPlayerList().sendMessage(CraftChatMessage.fromString(quitMessage));
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index d52985bc8236ba78b9530b4465e1f6de895f3b72..6b7209a4a5128a2fa64442365a4e53c7cf866621 100644
index 0fa95fa3a18c4f0e47c2becd01cf236a3acb4e82..6a0634322e4b86db2e33cef94c533dfee22e3244 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -499,6 +499,11 @@ public abstract class PlayerList {
@ -54,7 +54,7 @@ index d52985bc8236ba78b9530b4465e1f6de895f3b72..6b7209a4a5128a2fa64442365a4e53c7
WorldServer worldserver = entityplayer.getWorldServer();
entityplayer.a(StatisticList.LEAVE_GAME);
@@ -589,7 +594,7 @@ public abstract class PlayerList {
@@ -598,7 +603,7 @@ public abstract class PlayerList {
cserver.getScoreboardManager().removePlayer(entityplayer.getBukkitEntity());
// CraftBukkit end

4
patches/server/0048-Heavily-optimize-recipe-lookups-in-CraftingManager.patch
View File

@ -152,10 +152,10 @@ index 58ecbe1e20581dc9e78cdd2f4ece29cfa014da8a..3da86dc56f33e4f1900f6b4f66ca6696
for (Recipes<?> recipeType : IRegistry.RECIPE_TYPE) {
this.recipes.put(recipeType, new Object2ObjectLinkedOpenHashMap<>());
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 5a62ac72edc49cd032cd02fa8d007959517d063b..391421214d2fcc0cb38ac42d053cc1c57545fa73 100644
index 3adb29f004d2fee36f3ee9b21ee5417e84b64837..376ab1d4c4f729639714b5eeedec514a2176531a 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -575,6 +575,7 @@ public final class ItemStack {
@@ -570,6 +570,7 @@ public final class ItemStack {
return !this.e() ? this.doMaterialsMatch(itemstack) : !itemstack.isEmpty() && this.getItem() == itemstack.getItem();
}