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

Update Upstream

Browse Source
This commit is contained in:
tr7zw 2020-07-29 14:30:48 +02:00
parent f0c04d75b6
commit ad523112fa
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tuinity

@ -1 +1 @@
Subproject commit 699f5f2fb02e78493f44499a6b6f91c8d2406922 Subproject commit 489faf00462e476cb51a625a6b63fa418d7b7777

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

@ -70,10 +70,10 @@ index d434bd93bc26840129274f45a303fe2c1a44f132..8fc533009f417c1f18e7d118ac2ca1b8
private final String bukkitVersion = Versioning.getBukkitVersion(); private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft"); private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index f1e60981abc46807f8004f0ac49127a2bb83fc42..936d97530f546c9467fbf6b3dcde3df270e2422e 100644 index 90c1067ca23e566a96d71e06c273d44397928b64..b10401598601e422d7d6835cc10fd4807bc24e49 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -323,7 +323,7 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -326,7 +326,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@Override @Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {

4
patches/server/0014-Purpur-Add-more-timings-timers.patch
View File

@ -196,10 +196,10 @@ index d3f0327a2a7cdedf3fe8d10df981a9f1cb378d26..cce7cac92b3256576fb35d5d03719b15
public final Stream<PathfinderGoalWrapped> getExecutingGoals() { return d(); } // Paper - OBFHELPER public final Stream<PathfinderGoalWrapped> getExecutingGoals() { return d(); } // Paper - OBFHELPER
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 8388629f573ff8ac4aea0b8fe6b041e293f70a2d..90b159db4e36d67e742dcfc92dbb56af7f9f9acb 100644 index 2bee2dab9f19899c491bd381063b9185adcb5b2e..1a3972a786dc9fb131e88adf00bd1b345bda06ef 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1337,7 +1337,9 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -1339,7 +1339,9 @@ public class WorldServer extends World implements GeneratorAccessSeed {
return IRegistry.ENTITY_TYPE.getKey(entity1.getEntityType()).toString(); return IRegistry.ENTITY_TYPE.getKey(entity1.getEntityType()).toString();
}); });
gameprofilerfiller.c("tickPassenger"); gameprofilerfiller.c("tickPassenger");

2
patches/server/0015-Modify-default-configs.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Modify default configs
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 741c06a27e664211a7023a6369f8e69cbb41a321..f48fb8c3e637d0a7259bc92e5fb090c346750e47 100644 index 56e4359ba32339e1bef58061585ff3e12e4215f3..8b607a76ab5cb6beadff3dc5e6832a394982063e 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -201,7 +201,7 @@ public class PaperConfig { @@ -201,7 +201,7 @@ public class PaperConfig {