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

Officially Update to 1.16.1 \o/

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

Paper Changes:
ab347c4c9 Updated Upstream (Bukkit/CraftBukkit/Spigot)
e2e09326d [Auto] Updated Upstream (Bukkit/CraftBukkit)
778d63b19 Add Gradle usage information to README (#3700)
25c14f76f Fix compile
78c855237 Updated Upstream (CraftBukkit)
8a4af269b fix EntityDismountEvent being fired on gen threads
55fb7da78 Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16
d70195264 Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16
443fb80bf Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16
d75c939e5 Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16
1431b1d6c Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16
e4f2ec002 Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16
122475aee Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16
b98da027d Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16
a8ffecc74 Fix NPE and uuid lookup for player skulls
This commit is contained in:
William Blake Galbreath
2020-06-30 00:30:31 -05:00
parent b6a9c2ea3b
commit ce403193df
12 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server/0024-Player-invulnerabilities.patch
View File

@@ -1,4 +1,4 @@
From 475fd521ac59a8425121d35cf70eb47039c89dab Mon Sep 17 00:00:00 2001
From 0828a5d793cb60992427e2f0af477835712183fb Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 2 May 2020 20:55:44 -0500
Subject: [PATCH] Player invulnerabilities
@@ -12,7 +12,7 @@ Subject: [PATCH] Player invulnerabilities
5 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 6fbbe515c..c627ea053 100644
index 508a91418e..07f8f0fa7d 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -141,6 +141,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -24,7 +24,7 @@ index 6fbbe515c..c627ea053 100644
}
// Paper start
public BlockPosition getPointInFront(double inFront) {
@@ -804,6 +806,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -801,6 +803,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
@@ -37,7 +37,7 @@ index 6fbbe515c..c627ea053 100644
@Override
public boolean damageEntity(DamageSource damagesource, float f) {
if (this.isInvulnerable(damagesource)) {
@@ -811,7 +819,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -808,7 +816,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
} else {
boolean flag = this.server.j() && this.canPvP() && "fall".equals(damagesource.translationIndex);
@@ -46,15 +46,15 @@ index 6fbbe515c..c627ea053 100644
return false;
} else {
if (damagesource instanceof EntityDamageSource) {
@@ -1057,6 +1065,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver.getWorld());
@@ -1054,6 +1062,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
this.world.getServer().getPluginManager().callEvent(changeEvent);
// CraftBukkit end
+ this.invulnerableTicks = worldserver.purpurConfig.playerSpawnInvulnerableTicks; // Purpur
return this;
}
}
@@ -2152,9 +2161,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -2149,9 +2158,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isFrozen() { // Paper - protected > public
@@ -74,7 +74,7 @@ index 6fbbe515c..c627ea053 100644
public Scoreboard getScoreboard() {
return getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 48a03c44f..85016aa76 100644
index 0d8daf4569..47a7d1c034 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1563,6 +1563,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -86,7 +86,7 @@ index 48a03c44f..85016aa76 100644
this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus));
// Paper end
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 3c5ba8f2f..5807e77da 100644
index 3c5ba8f2fd..5807e77dab 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -869,6 +869,8 @@ public abstract class PlayerList {
@@ -99,7 +99,7 @@ index 3c5ba8f2f..5807e77da 100644
return entityplayer1;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5fa333037..bd9b82dad 100644
index 5fa3330373..bd9b82dadf 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -75,4 +75,11 @@ public class PurpurWorldConfig {
@@ -115,7 +115,7 @@ index 5fa333037..bd9b82dad 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3bd2ffc20..9b1c4d932 100644
index 3bd2ffc206..9b1c4d9320 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2144,5 +2144,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {