Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2025-02-23 07:41:42 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream and Sidestream(s) (Tuinity)

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:
8ba1bab Updated Upstream (Paper)
This commit is contained in:
Ivan Pekov 2020-10-02 14:23:32 +03:00
parent e7043ccbff
commit 25423541d6
No known key found for this signature in database
GPG Key ID: BC975C392D9CA3A3
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tuinity

@ -1 +1 @@
Subproject commit ac6b72e9c6f70d7d20a382014f0b16896e05c40b
Subproject commit 8ba1babf17f8dfdbc3a0d3e64137e03a4f53caae

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

@ -66,7 +66,7 @@ index 7083b379568fd101bec19469b60daf062bc4d137..0a7f88de5c5c307ed01c2f4a43336571
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 c944b407df03fca1153978d0763313d44d6461c8..66d0cf7d4b0bbffbd5eff64bfc46806c6f834c21 100644
index 1b7daba994e9ee6d2dcf6562b0650f88e4b6714b..5760b40bdbee417f5bb5210f1271241ff8f36350 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -189,7 +189,7 @@ public abstract class PlayerList {

6
patches/server/0010-Player-saving-async-FileIO.patch
View File

@ -77,10 +77,10 @@ index ce4ebc96c01f3dacf4e4d0569d86f52140440d43..a52c0391b171c8a57de75f87c534ce1e
nbttagcompound.set("ShoulderEntityLeft", this.getShoulderEntityLeft());
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 66d0cf7d4b0bbffbd5eff64bfc46806c6f834c21..c3c3ddf7e65aaa63b8e7c65d5d513ae664526896 100644
index 5760b40bdbee417f5bb5210f1271241ff8f36350..090692feb9d3606786b52590d4da1c55962aa719 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1283,6 +1283,28 @@ public abstract class PlayerList {
@@ -1286,6 +1286,28 @@ public abstract class PlayerList {
if (team != null) scoreboard.removeTeam(team);
}
// Paper end
@ -109,7 +109,7 @@ index 66d0cf7d4b0bbffbd5eff64bfc46806c6f834c21..c3c3ddf7e65aaa63b8e7c65d5d513ae6
}
// Paper end
@@ -1320,13 +1342,13 @@ public abstract class PlayerList {
@@ -1323,13 +1345,13 @@ public abstract class PlayerList {
File file = this.server.a(SavedFile.STATS).toFile();
File file1 = new File(file, uuid + ".json");

2
patches/server/0018-Item-stuck-sleep-config.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Item stuck sleep config
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index 9110491fb4cf4424d737b47602a85abaa7f30bea..13a712f1c75a1d6d3a5cedb4a11b276818b38df0 100644
index bc4f84c8857aab45a69c915104de8d70b758698c..6c37b8981302783023762d4708fd3fbc51a5ef4a 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -82,7 +82,7 @@ public class EntityItem extends Entity {

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

@ -56,10 +56,10 @@ index 3fb72d6ee587d66a9b7e1dec27fc4f64b82ab4df..596815d70e69fd645bec5b6e8c1ebc7b
Throwable throwable = null;
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index c3c3ddf7e65aaa63b8e7c65d5d513ae664526896..c571ca533153e6d554d6da2a71b380224bdc6cd4 100644
index 090692feb9d3606786b52590d4da1c55962aa719..35d718da4d384f581eff9a5938a41ad2095800e4 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -634,6 +634,7 @@ public abstract class PlayerList {
@@ -637,6 +637,7 @@ public abstract class PlayerList {
GameProfileBanEntry gameprofilebanentry;
if (getProfileBans().isBanned(gameprofile) && (gameprofilebanentry = getProfileBans().get(gameprofile)) != null) {
// Paper end
@ -67,7 +67,7 @@ index c3c3ddf7e65aaa63b8e7c65d5d513ae664526896..c571ca533153e6d554d6da2a71b38022
chatmessage = new ChatMessage("multiplayer.disconnect.banned.reason", new Object[]{gameprofilebanentry.getReason()});
if (gameprofilebanentry.getExpires() != null) {
@@ -641,7 +642,11 @@ public abstract class PlayerList {
@@ -644,7 +645,11 @@ public abstract class PlayerList {
}
// return chatmessage;

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

@ -39,7 +39,7 @@ index cb4f173774b46793bc3744cb3242edd9272df463..4fac720564b8687fae59c0f2e4898a48
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 c571ca533153e6d554d6da2a71b380224bdc6cd4..25186df83c41ae168bca30b28149005f4b9f45e9 100644
index 35d718da4d384f581eff9a5938a41ad2095800e4..9442937faa85d99a4c72c76d7fc3a3abfef7ba34 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -500,6 +500,11 @@ public abstract class PlayerList {
@ -54,7 +54,7 @@ index c571ca533153e6d554d6da2a71b380224bdc6cd4..25186df83c41ae168bca30b28149005f
WorldServer worldserver = entityplayer.getWorldServer();
entityplayer.a(StatisticList.LEAVE_GAME);
@@ -585,7 +590,7 @@ public abstract class PlayerList {
@@ -588,7 +593,7 @@ public abstract class PlayerList {
cserver.getScoreboardManager().removePlayer(entityplayer.getBukkitEntity());
// CraftBukkit end

4
patches/server/0056-Respect-rotation-when-respawning.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Respect rotation when respawning
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 25186df83c41ae168bca30b28149005f4b9f45e9..95cd25230601d22f02a31667b048bfd1ecda6009 100644
index 9442937faa85d99a4c72c76d7fc3a3abfef7ba34..51762750985062eab337fea3a8eff1d5097ff2d4 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -812,7 +812,7 @@ public abstract class PlayerList {
@@ -815,7 +815,7 @@ public abstract class PlayerList {
entityplayer1.setRespawnPosition(worldserver1.getDimensionKey(), blockposition, f, flag1, false);
flag2 = !flag && flag3;
isBedSpawn = true;