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/EMC/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:
84aecdb Merge https://github.com/Spottedleaf/Tuinity into ver/1.16.3
de1983b Updated Upstream (Paper)

EMC Changes:
1499c3fb Un-Merge PlayerInteractEntity and PlayerInteractAtEntity
17184238 Updated Paper
d0715d42 Updated Paper

Purpur Changes:
32b7926 Fix #77 and credit correct author
42d9e8f Updated Upstream (Paper)
5026a31 Controllable minecarts fall damage option and slow down in air fix
d9c0631 Updated Upstream (Paper)
d40fd41 Fix broken /time command
d652384 Updated Upstream (Paper)
86a0769 Configurable daylight cycle
This commit is contained in:
Ivan Pekov 2020-10-11 20:37:55 +03:00
parent 0883fb0aec
commit 98b47c81e9
No known key found for this signature in database
GPG Key ID: BC975C392D9CA3A3
10 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Empirecraft

@ -1 +1 @@
Subproject commit 81f5e1fa341c3bcdeffd40026356732ed8032f80
Subproject commit 1499c3fb9e43280c79b15571a23324c4cd19bca1

16
PATCHES.md
View File

@ -10,17 +10,17 @@ This is an overview over all patches that are currently used.
| ----- | ------------- |:-------------:| -----:|
| server | Add 5 second tps average in /tps | William Blake Galbreath | |
| api | Add ChatColor.getById | Aikar | |
| server | Add GameProfileLookupEvent | tr7zw | |
| api | Add GameProfileLookupEvent | tr7zw | |
| server | Add GameProfileLookupEvent | tr7zw | |
| server | Add GlueList | Mykyta Komarn | |
| server | Add IntelliJ IDEA runnable | Bud Gidiere | |
| server | Add JsonList save timings | Ivan Pekov | |
| server | Add NBT API as a first-class lib | tr7zw | |
| api | Add NBT API as a first-class lib | tr7zw | |
| server | Add StructureLocateEvent | dfsek | |
| server | Add NBT API as a first-class lib | tr7zw | |
| api | Add StructureLocateEvent | dfsek | |
| server | Add last tick time API | Ivan Pekov | tr7zw |
| server | Add StructureLocateEvent | dfsek | |
| api | Add last tick time API | Ivan Pekov | tr7zw |
| server | Add last tick time API | Ivan Pekov | tr7zw |
| server | Add no-tick block list | William Blake Galbreath | |
| server | Add nspt command | Ivan Pekov | |
| server | Add option to disable dolphin treasure searching | William Blake Galbreath | |
@ -70,8 +70,8 @@ This is an overview over all patches that are currently used.
| server | Lagging threshold | William Blake Galbreath | |
| server | MC-168772 Fix - Add turtle egg block options | William Blake Galbreath | |
| server | MC-4 Fix - Item position desync | William Blake Galbreath | |
| server | Modify POM | tr7zw | |
| api | Modify POM | tr7zw | |
| server | Modify POM | tr7zw | |
| server | Modify default configs | tr7zw | |
| server | Nuke streams off BlockPosition | Ivan Pekov | |
| server | Nuke streams off SectionPosition | Ivan Pekov | |
@ -85,13 +85,13 @@ This is an overview over all patches that are currently used.
| server | Option for simpler Villagers | tr7zw | |
| server | Option to toggle milk curing bad omen | William Blake Galbreath | |
| server | Origami Server Config | Phoenix616 | |
| server | PaperPR - Add hex color code support for console logging | William Blake Galbreath | |
| server | PaperPR - Add hex color code support for console logging | Esophose | |
| server | Per entity (type) collision settings | MrIvanPlays | tr7zw |
| server | Persistent TileEntity Lore and DisplayName | jmp | |
| server | PlayerAttackEntityEvent | Ivan Pekov | |
| api | PlayerAttackEntityEvent | Ivan Pekov | |
| server | ProxyForwardDataEvent | Ivan Pekov | |
| server | PlayerAttackEntityEvent | Ivan Pekov | |
| api | ProxyForwardDataEvent | Ivan Pekov | |
| server | ProxyForwardDataEvent | Ivan Pekov | |
| server | Purpur config files | William Blake Galbreath | |
| server | Redirect Configs | tr7zw | |
| server | Remove some streams and object allocations | Phoenix616 | |

2
Purpur

@ -1 +1 @@
Subproject commit 5cc7709b4ce6f42562541d5784f8c2e94ddcd77c
Subproject commit 32b7926e7092c24b6ed04f0f88d31cc96bded508

2
Tuinity

@ -1 +1 @@
Subproject commit 82e5dfbbd70d419d3f6d2a029b122dfac0f0f012
Subproject commit 84aecdb8b07d83495c4589e992d2114673ce5877

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

@ -381,7 +381,7 @@ index c2b788bb29fdfec9b4b6768a42e32e5af966f0ae..00000000000000000000000000000000
-
- // Tuinity start - controlled flush for entity tracker packets
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index d280ff20082fa526fa08c38eeff5ef21d3134e76..1ec7046dd79c07203d7c4a8c60145db9d0ac3b82 100644
index 5f085743931cd43be1eac2886adf2ac45a3941b2..585b8c341e83a50714af2b35ea875ddeef38a826 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -440,7 +440,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -1682,12 +1682,12 @@ index 361f7857e461578e90cb71e15027dadaf794cb69..9fd735bb4e5590be1eec958f10acb76a
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java.rej b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java.rej
deleted file mode 100644
index c32fd03bad569d36b2225e89e9b550b08f83e4e2..0000000000000000000000000000000000000000
index b355db095a49ccee8027a4f350c45526abb98273..0000000000000000000000000000000000000000
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java.rej
+++ /dev/null
@@ -1,17 +0,0 @@
-diff a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java (rejected hunks)
-@@ -182,6 +182,7 @@ public class PurpurWorldConfig {
-@@ -184,6 +184,7 @@ public class PurpurWorldConfig {
- public boolean fixClimbingBypassingCrammingRule = false;
- public boolean milkCuresBadOmen = true;
- public boolean saveProjectilesToDisk = true;
@ -1695,7 +1695,7 @@ index c32fd03bad569d36b2225e89e9b550b08f83e4e2..00000000000000000000000000000000
- public double tridentLoyaltyVoidReturnHeight = 0.0D;
- public double voidDamageHeight = -64.0D;
- public int raidCooldownSeconds = 0;
-@@ -194,6 +195,7 @@ public class PurpurWorldConfig {
-@@ -196,6 +197,7 @@ public class PurpurWorldConfig {
- fixClimbingBypassingCrammingRule = getBoolean("gameplay-mechanics.fix-climbing-bypassing-cramming-rule", fixClimbingBypassingCrammingRule);
- milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
- saveProjectilesToDisk = getBoolean("gameplay-mechanics.save-projectiles-to-disk", saveProjectilesToDisk);

2
patches/server/0027-Fix-lead-fall-dmg-config.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Fix lead fall dmg config
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 1ec7046dd79c07203d7c4a8c60145db9d0ac3b82..898446130f264055eeca2e5de3c30201e05f484a 100644
index 585b8c341e83a50714af2b35ea875ddeef38a826..e0381ed6945f734f8802d07b8cbd6b27852db449 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1264,6 +1264,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

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

@ -849,7 +849,7 @@ index ac6e5e3309affc830d4db07fd9b8d809c3085033..b7fcbef8d38c9406a891d64f8016bc16
@Override
public NBTTagCompound i(BlockPosition blockposition) {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 898446130f264055eeca2e5de3c30201e05f484a..ebb35de9a2293594c1ec936463ea175cc0a8bec0 100644
index e0381ed6945f734f8802d07b8cbd6b27852db449..220d5273543ea0b143cf9c894c89cabea25c29d6 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -73,7 +73,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

2
patches/server/0043-Fix-LightEngineThreaded-memory-leak.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Fix LightEngineThreaded memory leak
diff --git a/src/main/java/net/minecraft/server/LightEngineThreaded.java b/src/main/java/net/minecraft/server/LightEngineThreaded.java
index fd0beefb900c064d3c35a3d2f79f5b7d9c1287bb..4d024a4849b7566c0faba131caab57b4ddf35e29 100644
index 2f9c97dd4e1d705a87772d18c7ab4883a876af08..f3494ac1ad659352ca5595adf9e6919bdb4018d0 100644
--- a/src/main/java/net/minecraft/server/LightEngineThreaded.java
+++ b/src/main/java/net/minecraft/server/LightEngineThreaded.java
@@ -104,6 +104,8 @@ public class LightEngineThreaded extends LightEngine implements AutoCloseable {

2
patches/server/0056-Use-faster-block-collision-check-for-entity-suffocat.patch
View File

@ -52,7 +52,7 @@ index 7ed343cfb3130446c85dab2ca04d60f91e2c94fb..194d2f177b05c594c7a27b6191860a3f
if (collisionShape != VoxelShapes.empty()) {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index ebb35de9a2293594c1ec936463ea175cc0a8bec0..2beb2b53e8d9f04e5d90898282d8cd186d251c14 100644
index 220d5273543ea0b143cf9c894c89cabea25c29d6..3be9be2df7623ec1068f5782261d70fb34b2aa54 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2156,9 +2156,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

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

@ -86,7 +86,7 @@ index 8974d7944f159b9346680c639daf0f8c06767cfe..bd610bfcd9571d7478ed13a0c35bc959
}
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 2beb2b53e8d9f04e5d90898282d8cd186d251c14..6357d05aad07e5c2f10c899637bc7739957f92d0 100644
index 3be9be2df7623ec1068f5782261d70fb34b2aa54..2f5bc2bde2f1231781b3738de57b4f9acc6113df 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2529,6 +2529,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke