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

Revert "flip some config defaults for vanilla parity"

Browse Source 
This reverts commit 808b1cbde5.
This commit is contained in:
granny
2023-03-18 18:36:32 -07:00
parent 808b1cbde5
commit 09b5d5446b
136 changed files with 809 additions and 695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0129-Fix-stuck-in-portals.patch
View File

@@ -17,7 +17,7 @@ index 7a9b5f6665e910f12bcc9d3ade8534a93aa09dd9..bc2c592a416c64619527bf5d1040f4a2
// CraftBukkit end
this.setLevel(worldserver);
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index a466eb10690bc0fe204815d758cc69798ce94f13..8ff2aab5f04891af319ed8a07890ed62f770016c 100644
index a952685ec8907fe4ad0fb9f12855679e0983d9ca..41887aef504f1c2cb5cd3d16afd7c557f8831fc2 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2903,12 +2903,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -37,10 +37,10 @@ index a466eb10690bc0fe204815d758cc69798ce94f13..8ff2aab5f04891af319ed8a07890ed62
this.isInsidePortal = true;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ceaf9f0e9e4634bd781fc9af3190515ebf727c17..1fab229a0ff9cd91997b1b72172f33e11f0ae2a1 100644
index 6ebc9259107efa55298f0f99cac8e07f79a8b83e..eab135372764fe2be0244cddadaa8891bba0fb45 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -324,6 +324,7 @@ public class PurpurWorldConfig {
@@ -337,6 +337,7 @@ public class PurpurWorldConfig {
public int playerDeathExpDropMax = 100;
public boolean teleportIfOutsideBorder = false;
public boolean totemOfUndyingWorksInInventory = false;
@@ -48,7 +48,7 @@ index ceaf9f0e9e4634bd781fc9af3190515ebf727c17..1fab229a0ff9cd91997b1b72172f33e1
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -341,6 +342,7 @@ public class PurpurWorldConfig {
@@ -354,6 +355,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);