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)

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

Paper Changes:
PaperMC/Paper@a622eba Fix beehives generating from using bonemeal (#9052)
PaperMC/Paper@fbf74ba Updated Upstream (CraftBukkit) (#9053)
This commit is contained in:
granny
2023-03-26 23:43:18 -07:00
parent 49d99462fa
commit 7e014a84b5
31 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0018-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 dae286863e7bf9316b23724f14d0f22f522cad4a..90baf612964501ce7048610f62e538946c420174 100644
index 71905201cd42094fa3f545f29ada0f7ebcd7c21d..f5c5ed6cfb963ad2b5612fd7623d5e0f3ea058bb 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -275,6 +275,7 @@ public class ServerPlayer extends Player {
@@ -276,6 +276,7 @@ public class ServerPlayer extends Player {
public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
public boolean purpurClient = false; // Purpur
@@ -16,7 +16,7 @@ index dae286863e7bf9316b23724f14d0f22f522cad4a..90baf612964501ce7048610f62e53894
public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
@@ -374,6 +375,7 @@ public class ServerPlayer extends Player {
@@ -375,6 +376,7 @@ public class ServerPlayer extends Player {
this.bukkitPickUpLoot = true;
this.maxHealthCache = this.getMaxHealth();
this.cachedSingleMobDistanceMap = new com.destroystokyo.paper.util.PooledHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
@@ -24,7 +24,7 @@ index dae286863e7bf9316b23724f14d0f22f522cad4a..90baf612964501ce7048610f62e53894
}
// Yes, this doesn't match Vanilla, but it's the best we can do for now.
@@ -1055,6 +1057,12 @@ public class ServerPlayer extends Player {
@@ -1056,6 +1058,12 @@ public class ServerPlayer extends Player {
}
@@ -37,7 +37,7 @@ index dae286863e7bf9316b23724f14d0f22f522cad4a..90baf612964501ce7048610f62e53894
@Override
public boolean hurt(DamageSource source, float amount) {
if (this.isInvulnerableTo(source)) {
@@ -1062,7 +1070,7 @@ public class ServerPlayer extends Player {
@@ -1063,7 +1071,7 @@ public class ServerPlayer extends Player {
} else {
boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && source.is(DamageTypeTags.IS_FALL);
@@ -46,7 +46,7 @@ index dae286863e7bf9316b23724f14d0f22f522cad4a..90baf612964501ce7048610f62e53894
return false;
} else {
Entity entity = source.getEntity();
@@ -1242,6 +1250,7 @@ public class ServerPlayer extends Player {
@@ -1243,6 +1251,7 @@ public class ServerPlayer extends Player {
}
// Paper end
@@ -54,7 +54,7 @@ index dae286863e7bf9316b23724f14d0f22f522cad4a..90baf612964501ce7048610f62e53894
return this;
}
}
@@ -2044,6 +2053,7 @@ public class ServerPlayer extends Player {
@@ -2055,6 +2064,7 @@ public class ServerPlayer extends Player {
}
public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) {
@@ -62,7 +62,7 @@ index dae286863e7bf9316b23724f14d0f22f522cad4a..90baf612964501ce7048610f62e53894
this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt));
}
@@ -2575,9 +2585,17 @@ public class ServerPlayer extends Player {
@@ -2586,9 +2596,17 @@ public class ServerPlayer extends Player {
@Override
public boolean isImmobile() {
@@ -121,10 +121,10 @@ index 86a1f0733ed2aabe09fc748bdf9561d9b9a8286e..3ed1af31cf0beb945699480bca104e7a
return entityplayer1;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 2d1ff613dabbc6ae247caf03e79bb7033c28c739..254d91e2a06186d602f7edae7a46b0e4ee9be662 100644
index 5e5062648d0822f9364dbefddb3f496f39001e23..0ed68ef0152b36960d74e9d7f0466cf09eaacfac 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3174,5 +3174,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3184,5 +3184,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}