stop mobs from targeting afk players (#564)

Co-authored-by: Encode42 <me@encode42.dev>
This commit is contained in:
granny
2021-08-08 18:32:27 -07:00
committed by GitHub
parent 3c451101ac
commit fc79bca3c5
141 changed files with 502 additions and 484 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix stuck in portals
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 48ecf94e218094ea291776cd54ad81fca325848f..d9d66723333c64ee8b0e08248c95bc624941ceed 100644
index 98584609ed1ba2bc4cc803482326fa1525a779bb..60aeda60b99a21c4482c484c0a61494a06ae71ff 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1142,6 +1142,7 @@ public class ServerPlayer extends Player {
@@ -37,10 +37,10 @@ index a1d4bcbafbc80c653ef622828e67145e72fc2ad0..565af7ade5c3de6a1c7a01755db1b7c6
this.isInsidePortal = true;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 64bfc25a823f26e751f6f27a829a8333cdb8e145..d9116e08fe128991a729694549143be0ebb4bade 100644
index 50f271ff9949241caec638d96caa782f945b7d52..b578c89ed02b093e329ba93775a3552e5a568883 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -295,6 +295,7 @@ public class PurpurWorldConfig {
@@ -296,6 +296,7 @@ public class PurpurWorldConfig {
public int playerDeathExpDropMax = 100;
public boolean teleportIfOutsideBorder = false;
public boolean totemOfUndyingWorksInInventory = false;
@@ -48,7 +48,7 @@ index 64bfc25a823f26e751f6f27a829a8333cdb8e145..d9116e08fe128991a729694549143be0
private void playerSettings() {
idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
@@ -306,6 +307,7 @@ public class PurpurWorldConfig {
@@ -308,6 +309,7 @@ public class PurpurWorldConfig {
playerDeathExpDropMax = getInt("gameplay-mechanics.player.exp-dropped-on-death.maximum", playerDeathExpDropMax);
teleportIfOutsideBorder = getBoolean("gameplay-mechanics.player.teleport-if-outside-border", teleportIfOutsideBorder);
totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory);