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

Updated Upstream (Paper)

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

Paper Changes:
2c6b1f048 Revert "Remove itneract event from boat" (Fixes #5677)
aae1c54a9 Add command line option to load extra plugin jars not in the plugins folder
322886c86 Avoid NPE due to PlayerBedFailEnterEvent
d3c9a195c removed duplicate ProjectileHitEvent for fireball (#5671)
7989028a5 More Enchantment API (#5588)
c0cb5c129 Adds methods for checking item repairability (#5651)
22399b07f Actually use extended/ambient in BeaconEffectEvent (#5647)
979135878 Add cause and cancel message to PlayerGameModeChangeEvent (#5638)
51e1e58d2 Fix Adventure support in UnknownCommandEvent (#5664)
45e19ffb0 [Auto] Updated Upstream (CraftBukkit)
151457628 Fix Counter#decrement recursive call (#5665)
21ac7dc98 [Auto] Updated Upstream (CraftBukkit)
18ad2c9dd Add environment variable (PAPER_DISABLE_SERVER_GUI) to disable server gui
This commit is contained in:
Ben Kerllenevich
2021-05-19 18:01:23 -04:00
parent c333d3d98e
commit 6bd246b947
44 changed files with 108 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0017-Player-invulnerabilities.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java
index 3fdb32f8d8c647e2430fa364e5aaa40de803b025..b336e47b21a0693ebfeae8eb752258a3e2f6d4f4 100644
index aee1946f96ec6007caef63b2183c5218ffe71836..e65a3e3e7bf6a366c30b44e166e2085966ebc933 100644
--- a/src/main/java/net/minecraft/server/level/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java
@@ -285,6 +285,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -17,7 +17,7 @@ index 3fdb32f8d8c647e2430fa364e5aaa40de803b025..b336e47b21a0693ebfeae8eb752258a3
}
// Paper start
public BlockPosition getPointInFront(double inFront) {
@@ -1120,6 +1122,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1129,6 +1131,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
@@ -30,7 +30,7 @@ index 3fdb32f8d8c647e2430fa364e5aaa40de803b025..b336e47b21a0693ebfeae8eb752258a3
@Override
public boolean damageEntity(DamageSource damagesource, float f) {
if (this.isInvulnerable(damagesource)) {
@@ -1127,7 +1135,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1136,7 +1144,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
} else {
boolean flag = this.server.j() && this.canPvP() && "fall".equals(damagesource.translationIndex);
@@ -39,7 +39,7 @@ index 3fdb32f8d8c647e2430fa364e5aaa40de803b025..b336e47b21a0693ebfeae8eb752258a3
return false;
} else {
if (damagesource instanceof EntityDamageSource) {
@@ -1303,6 +1311,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1312,6 +1320,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
// Paper end
@@ -47,7 +47,7 @@ index 3fdb32f8d8c647e2430fa364e5aaa40de803b025..b336e47b21a0693ebfeae8eb752258a3
return this;
}
}
@@ -2504,9 +2513,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -2520,9 +2529,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isFrozen() { // Paper - protected > public
@@ -67,7 +67,7 @@ index 3fdb32f8d8c647e2430fa364e5aaa40de803b025..b336e47b21a0693ebfeae8eb752258a3
public Scoreboard getScoreboard() {
return getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
index 85964e7fe2cc96ad3b967dadd9ee5d095ee60e2a..937983f27bf11634ccb9044d5dff42e7d77ec9ba 100644
index e4eb83c5090c00fe405d061fe32b8e176baa264e..129e3083a029bc3f55f2f117fdc5f8faaadcf9c0 100644
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
@@ -1901,6 +1901,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -108,7 +108,7 @@ index 2578a4677d1ee060f687be531e696b7c7be89e84..c441fcea9b2b5a77b801c8a69541cf42
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 36926b8ed2a0304c89296aa743510bb3c415a07e..d7f24ef07d731c83408ceff7bc5da7221d49d5e9 100644
index 05bd48bb026a71dd420b4d73c58da781828d58e4..14b9e4c845d73946f4151c902e12aa0690b9414c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2510,5 +2510,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {