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

make initAttributes non abstract

Browse Source
This commit is contained in:
William Blake Galbreath
2021-06-21 23:00:24 -05:00
parent afabb3c5b6
commit fb509120d8
15 changed files with 48 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
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/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 392ea7fe0b522cece303168194c714fb30906fe1..2818671f0fb3aa1588655f5f314eebdbd60bfac1 100644
index 65e59e3bfc07e1ba6fadd7d83e0f5eb7a58fcf78..609afae1bfdbeb82fb48bdbb0200427a67f1cd2a 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 {
@@ -14,9 +14,9 @@ index 392ea7fe0b522cece303168194c714fb30906fe1..2818671f0fb3aa1588655f5f314eebdb
this.cachedSingleMobDistanceMap = new com.destroystokyo.paper.util.PooledHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
+ this.spawnInvulnerableTime = world.purpurConfig.playerSpawnInvulnerableTicks; // Purpur
}
// Purpur start
@@ -982,6 +983,12 @@ public class ServerPlayer extends Player {
// Paper start - Chunk priority
public BlockPos getPointInFront(double inFront) {
@@ -974,6 +975,12 @@ public class ServerPlayer extends Player {
}
@@ -29,7 +29,7 @@ index 392ea7fe0b522cece303168194c714fb30906fe1..2818671f0fb3aa1588655f5f314eebdb
@Override
public boolean hurt(DamageSource source, float amount) {
if (this.isInvulnerableTo(source)) {
@@ -989,7 +996,7 @@ public class ServerPlayer extends Player {
@@ -981,7 +988,7 @@ public class ServerPlayer extends Player {
} else {
boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && "fall".equals(source.msgId);
@@ -38,7 +38,7 @@ index 392ea7fe0b522cece303168194c714fb30906fe1..2818671f0fb3aa1588655f5f314eebdb
return false;
} else {
if (source instanceof EntityDamageSource) {
@@ -1164,6 +1171,7 @@ public class ServerPlayer extends Player {
@@ -1156,6 +1163,7 @@ public class ServerPlayer extends Player {
}
// Paper end
@@ -46,25 +46,24 @@ index 392ea7fe0b522cece303168194c714fb30906fe1..2818671f0fb3aa1588655f5f314eebdb
return this;
}
}
@@ -2386,9 +2394,17 @@ public class ServerPlayer extends Player {
@@ -2378,8 +2386,16 @@ public class ServerPlayer extends Player {
@Override
public boolean isImmobile() {
- return super.isImmobile() || (this.connection != null && this.connection.isDisconnected()); // Paper
+ return super.isImmobile() || frozen || (this.connection != null && this.connection.isDisconnected()); // Paper // Purpur
}
+ }
+
+ // Purpur start
+ private boolean frozen = false;
+
+ public void setFrozen(boolean frozen) {
+ this.frozen = frozen;
+ }
}
+ // Purpur end
+
@Override
public Scoreboard getScoreboard() {
return this.getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 4473e5123568a35dd59b769a529f5670cf9bdc4a..4659247703679bd3c860ea5d685ae985daf799ce 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java