Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27: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/0019-Player-invulnerabilities.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index cf7945ec299ebbef1d5bb0319f0795b47987bb1a..bc7c87bf1d2f4e6eac9b094bfe111d289bea83f6 100644
index 4713ca7eaa178916508476472a2ca899c6587dc2..44b0e610fa2eb5f73a74bfadefc3f58bd20d6f6d 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -333,6 +333,7 @@ public class ServerPlayer extends Player {
@@ -338,6 +338,7 @@ public class ServerPlayer extends Player {
this.bukkitPickUpLoot = true;
this.maxHealthCache = this.getMaxHealth();
this.cachedSingleMobDistanceMap = new com.destroystokyo.paper.util.PooledHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
@@ -16,7 +16,7 @@ index cf7945ec299ebbef1d5bb0319f0795b47987bb1a..bc7c87bf1d2f4e6eac9b094bfe111d28
}
// Paper start - Chunk priority
public BlockPos getPointInFront(double inFront) {
@@ -974,6 +975,12 @@ public class ServerPlayer extends Player {
@@ -979,6 +980,12 @@ public class ServerPlayer extends Player {
}
@@ -29,7 +29,7 @@ index cf7945ec299ebbef1d5bb0319f0795b47987bb1a..bc7c87bf1d2f4e6eac9b094bfe111d28
@Override
public boolean hurt(DamageSource source, float amount) {
if (this.isInvulnerableTo(source)) {
@@ -981,7 +988,7 @@ public class ServerPlayer extends Player {
@@ -986,7 +993,7 @@ public class ServerPlayer extends Player {
} else {
boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && "fall".equals(source.msgId);
@@ -38,7 +38,7 @@ index cf7945ec299ebbef1d5bb0319f0795b47987bb1a..bc7c87bf1d2f4e6eac9b094bfe111d28
return false;
} else {
if (source instanceof EntityDamageSource) {
@@ -1156,6 +1163,7 @@ public class ServerPlayer extends Player {
@@ -1161,6 +1168,7 @@ public class ServerPlayer extends Player {
}
// Paper end
@@ -46,7 +46,7 @@ index cf7945ec299ebbef1d5bb0319f0795b47987bb1a..bc7c87bf1d2f4e6eac9b094bfe111d28
return this;
}
}
@@ -2390,8 +2398,16 @@ public class ServerPlayer extends Player {
@@ -2395,8 +2403,16 @@ public class ServerPlayer extends Player {
@Override
public boolean isImmobile() {
@@ -65,7 +65,7 @@ index cf7945ec299ebbef1d5bb0319f0795b47987bb1a..bc7c87bf1d2f4e6eac9b094bfe111d28
@Override
public Scoreboard getScoreboard() {
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index af0c7bbce7641f5aa659abb440a6cd6f57019ede..71030d9e156ce28f1ef9e3ed6845f022a62dfdaf 100644
index 210b774eae5d76823e171016e9e6b706e8da4f07..550ff06264aa4fffdd9b9291efec121ac034d963 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1938,6 +1938,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser