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/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:
82e5dfb Updated Upstream (Paper)

Origami Changes:
7e2a3f6 Update Paper

Purpur Changes:
5cc7709 Make mobs avoid stonecutter blocks
129484a Stonecutter damage
8295d22 Updated Upstream (Paper)
d23a158 Infinity bow settings
5c0a270 Make infinite lava number of required sources configurable
ef17322 Update readme
70e2ec0 Cleanup codebase
81ca45c Flying squids! Oh my!
This commit is contained in:
Ivan Pekov 2020-10-08 14:24:41 +03:00
parent 0a19056af0
commit 252bf7e437
No known key found for this signature in database
GPG Key ID: BC975C392D9CA3A3
11 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Origami

@ -1 +1 @@
Subproject commit b69a0150e1c843caa4c32781b7421a90593fcd81
Subproject commit 7e2a3f6ddd399c7c8c0f9e52515ef2f921913070

1
PATCHES.md
View File

@ -72,7 +72,6 @@ # Patches
| server | Lagging threshold | William Blake Galbreath | |
| server | Load also the chunk that you're teleporting to | Ivan Pekov | |
| server | MC-168772 Fix - Add turtle egg block options | William Blake Galbreath | |
| server | MC-171420 - Fix deop kicking non-whitelisted player when | William Blake Galbreath | |
| server | MC-4 Fix - Item position desync | William Blake Galbreath | |
| api | Modify POM | tr7zw | |
| server | Modify POM | tr7zw | |

2
Purpur

@ -1 +1 @@
Subproject commit 4984bb71e086fd0204d62599ea94298873c212a4
Subproject commit 5cc7709b4ce6f42562541d5784f8c2e94ddcd77c

2
Tuinity

@ -1 +1 @@
Subproject commit d41103d09837cbec91f381107f64cfcb48b91089
Subproject commit 82e5dfbbd70d419d3f6d2a029b122dfac0f0f012

2
patches/Purpur/server.txt
View File

@ -1 +1 @@
Purpur-config-files&Timings-stuff&Barrels-and-enderchests-6-rows&Lagging-threshold&Configurable-villager-brain-ticks&Alternative-Keepalive-Handling&MC-168772-Fix-Add-turtle-egg-block-options&MC-4-Fix-Item-position-desync&Fix-outdated-server-showing-in-ping-before-server-fu&Dont-send-useless-entity-packets&Cows-eat-mushrooms&Snowman-drop-and-put-back-pumpkin&Allow-soil-to-moisten-from-water-directly-under-it&Option-to-toggle-milk-curing-bad-omen&Fix-the-dead-lagging-the-server&Skip-events-if-there-s-no-listeners&Add-permission-for-F3-N-debug&Allow-leashing-villagers&Add-option-to-disable-saving-projectiles-to-disk&Add-5-second-tps-average-in-tps&MC-171420-Fix-deop-kicking-non-whitelisted-player-wh&Entity-lifespan&Squid-EAR-immunity&Allow-anvil-colors&Add-no-tick-block-list&Add-option-to-disable-dolphin-treasure-searching&Stop-squids-floating-on-top-of-water&Despawn-rate-config-options-per-projectile-type&PaperPR-Add-hex-color-code-support-for-console-loggi&Persistent-TileEntity-Lore-and-DisplayName
Purpur-config-files&Timings-stuff&Barrels-and-enderchests-6-rows&Lagging-threshold&Configurable-villager-brain-ticks&Alternative-Keepalive-Handling&MC-168772-Fix-Add-turtle-egg-block-options&MC-4-Fix-Item-position-desync&Fix-outdated-server-showing-in-ping-before-server-fu&Dont-send-useless-entity-packets&Cows-eat-mushrooms&Snowman-drop-and-put-back-pumpkin&Allow-soil-to-moisten-from-water-directly-under-it&Option-to-toggle-milk-curing-bad-omen&Fix-the-dead-lagging-the-server&Skip-events-if-there-s-no-listeners&Add-permission-for-F3-N-debug&Allow-leashing-villagers&Add-option-to-disable-saving-projectiles-to-disk&Add-5-second-tps-average-in-tps&Entity-lifespan&Squid-EAR-immunity&Allow-anvil-colors&Add-no-tick-block-list&Add-option-to-disable-dolphin-treasure-searching&Stop-squids-floating-on-top-of-water&Despawn-rate-config-options-per-projectile-type&PaperPR-Add-hex-color-code-support-for-console-loggi&Persistent-TileEntity-Lore-and-DisplayName

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

@ -77,7 +77,7 @@ index 3b10fcc13893403b29f0260b8605144679e89b82..1e9a96d8b08cc396acf73dc420830093
+ // Yatopia end
}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 9bae4704b306b1d04534072690355983856c7801..0be0fee99ee62f7b5a86caee5d99705ceaaeece1 100644
index 4d1970bec04c5a3cf01d214f583efb0e1d08380d..97fad9d83badb0aff15189f62cc065dae90ad3df 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -696,4 +696,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent

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

@ -1181,7 +1181,7 @@ index 963c90c065a9e362c8c3030bb36ac6bf0c14a8e2..00000000000000000000000000000000
-
- public boolean checkIfLeftOwner() { return this.h(); } // Purpur - OBFHELPER
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 18d50e11a94aa2b093d88a9ffcb40859e1516990..6da7e4acb1993b919afc5c5c063010a26568e707 100644
index cd6c0753bdf11c2ae7075e40cd91cc517d8d71b9..8a454e66547ccb3ec2dfef922ec46b2a4595a81a 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1295,7 +1295,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

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

@ -39,7 +39,7 @@ index 74ed02fa9296583977bb721014b10ff8b708b43c..a13c7b2b5bc79ecaea404779149ed02c
.completer(new ConsoleCommandCompleter(this.server))
);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 6da7e4acb1993b919afc5c5c063010a26568e707..96943eae34eb95d14f45cd59bc73c7901baf27c4 100644
index 8a454e66547ccb3ec2dfef922ec46b2a4595a81a..662a005becd1d2642ae50c25fdf3bfadf7ae6ae2 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1520,7 +1520,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

2
patches/server/0005-Add-last-tick-time-API.patch
View File

@ -7,7 +7,7 @@ Original patch by:
Co-authored-by: tr7zw <tr7zw@live.de>
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 96943eae34eb95d14f45cd59bc73c7901baf27c4..ac31ce44ec5605a9f6bede0e68c13a7696ad0521 100644
index 662a005becd1d2642ae50c25fdf3bfadf7ae6ae2..21a0656ce8a44acf45a1756add556a5c71e3eeb7 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -935,6 +935,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

2
patches/server/0049-Optimize-whitelist-command-for-multiple-additions-re.patch
View File

@ -185,7 +185,7 @@ index 0224a6d0e47e836fa485b39e7b4ce5b83ea554bf..fe578d306575bbdc8ca4a993a648e889
return (String[]) this.d.keySet().toArray(new String[this.d.size()]);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index ac31ce44ec5605a9f6bede0e68c13a7696ad0521..31ba3474b4dfdc2d60d127e0ff667744941d55ec 100644
index 21a0656ce8a44acf45a1756add556a5c71e3eeb7..6d62aa2b08f40479997f8bcc841cfb704b18e1b9 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1959,6 +1959,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

2
patches/server/0064-Async-entity-tracking.patch
View File

@ -307,7 +307,7 @@ index 6c8cb39ac8786734cda994ef29ba74c685f3b9be..36d4aeec34186c3f065d7bae3cc49a49
// Paper start - remove allocation of Vec3D here
//Vec3D vec3d = entityplayer.getPositionVector().d(this.tracker.getPositionVector()); // MC-155077, SPIGOT-5113
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 715d2c5e888b4a5c955d2dee2429757a27b50b00..e1e1aafd5dde611a3f2c72273f7af431006851b1 100644
index 7e91e95941039cce630ed3eb88e1919e1d08c091..9225658cdfb12ae918b5410515f0b3145ed15369 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1253,10 +1253,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {