Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Tuinity)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
02fbcbc Add reobf mappings patch for LevelChunk#level (CraftBukkit changes type) (#6079)
2641b91 Also deobfuscate secondary stacktraces in crash reports (#6078)
cc063e1 Fix incorrect variable usage in per-player mob spawning patch (#6077)

Tuinity Changes:
4867bfb Use correct y value for snow/ice formation
361be02 Update paper
This commit is contained in:
William Blake Galbreath
2021-07-04 12:49:50 -05:00
parent 1a2d7015b0
commit 8b67a588a8
15 changed files with 57 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0005-Ridables.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Ridables
diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java
index 009febf8fccbfc9a638f018f921ebd9ec9068196..73e52022d27f59278b743c7765323f94a2c11d0e 100644
index b01d7da333bac7820e42b6f645634a15ef88ae4f..30a4b80eacf76ad7f0a48b79bcf01b752c0af48a 100644
--- a/src/main/java/net/minecraft/core/BlockPos.java
+++ b/src/main/java/net/minecraft/core/BlockPos.java
@@ -41,6 +41,12 @@ public class BlockPos extends Vec3i {
@@ -34,7 +34,7 @@ index 4cc099b469a7554e381a6f7aceb686a94f7d6605..06177ec182d79cd101da9cd43a841656
this.profiler.push(() -> {
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index a4546a80b0d1fde8c4f92fea575745b1352d95b0..004bdf930769974ed02c68b8939af8e96bad88a7 100644
index a83b4e9b6b5bd6a57d4bc2f1cdc78ffb7e7d2fdd..26c39cb0cd5e3c22825067f0d0d439c1044955a2 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -205,6 +205,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
@@ -46,10 +46,10 @@ index a4546a80b0d1fde8c4f92fea575745b1352d95b0..004bdf930769974ed02c68b8939af8e9
return new Throwable(entity + " Added to world at " + new java.util.Date());
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 217af30c81438836864312e125cf512b491a3ab4..4935937ec8da9979b64e1445f74c38cc5f49eec1 100644
index 0da2dbeba93d428a035872e05177ed3fc29acf9b..56a60f26695cc888ee3f1f394f7d6108a3426071 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -663,6 +663,15 @@ public class ServerPlayer extends Player {
@@ -668,6 +668,15 @@ public class ServerPlayer extends Player {
}
this.advancements.flushDirty(this);
@@ -65,7 +65,7 @@ index 217af30c81438836864312e125cf512b491a3ab4..4935937ec8da9979b64e1445f74c38cc
}
public void doTick() {
@@ -2379,4 +2388,6 @@ public class ServerPlayer extends Player {
@@ -2384,4 +2393,6 @@ public class ServerPlayer extends Player {
return (CraftPlayer) super.getBukkitEntity();
}
// CraftBukkit end
@@ -73,7 +73,7 @@ index 217af30c81438836864312e125cf512b491a3ab4..4935937ec8da9979b64e1445f74c38cc
+
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 9dc5c82ea1d497174d288000f9f1ccaabbcb4a18..86159b0fcf33b70310f060962ab37cd6f05bf642 100644
index f78119970da27ef66a9d9093e2e42ce129d4cf31..17a6857f5ee70120d664e46426f739ef2dae0a0a 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2427,6 +2427,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -4526,7 +4526,7 @@ index 69f439851fe1ff07d827eaed274940a5783d5f6c..07853aff3d42ce50799406ee1c14389b
Projectile(EntityType<? extends Projectile> type, Level world) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 1d76057b1b2dc9f0fc8e3fe5a5f6bfee23128007..f7c46b8173d30192853c875675a1ed0f59170b34 100644
index fcf5f32c32eb17f7580b3c8c9190e36725f793ad..d92812cb334b590b728afb828dae61da483d8d56 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -154,4 +154,9 @@ public class PurpurConfig {