Ajustable burp delay (#1153)

This commit is contained in:
5jd
2022-10-15 18:57:23 +02:00
committed by GitHub
parent 9bd5c4437a
commit 3454e6a047
57 changed files with 309 additions and 306 deletions

View File

@@ -9,7 +9,7 @@ players still only pick up one orb every tick. However, setting this
to any negative number will pick up all orbs instantly.
diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
index cbeea12009ec89fb3223e6a9545485a9bc19c21f..b10c792a4f743bdb8a10fe1693def562d161a879 100644
index 02bc7ccb4db6e9a287b32c887a455976096dcc10..0803fef3f3e2efb947de4a145e6089177764514e 100644
--- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
+++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
@@ -303,8 +303,8 @@ public class ExperienceOrb extends Entity {
@@ -24,7 +24,7 @@ index cbeea12009ec89fb3223e6a9545485a9bc19c21f..b10c792a4f743bdb8a10fe1693def562
int i = this.repairPlayerItems(player, this.value);
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 45e634589ae1bd83de281bacbe2024531d0351fb..64ca2c92c4908bbb0272d1c22870af68aa9daad2 100644
index 68dc6a007021f8c97530c1d1c4f92cbb7f573661..e87a436711e179a4384630de41188c09a75a7f0d 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -631,7 +631,7 @@ public abstract class Player extends LivingEntity {
@@ -37,10 +37,10 @@ index 45e634589ae1bd83de281bacbe2024531d0351fb..64ca2c92c4908bbb0272d1c22870af68
} else if (!entity.isRemoved()) {
this.touch(entity);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 746faa9d17f1f99ea97eafb22850b02ae81795ad..789eb302e6206666f62bfb49b5f2dbce1b49b1e7 100644
index f48e6d635906d07eb34c08bb94ef11de401e3ad6..c4ffc47514f141353825f2e4b1db7647fa4520d4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -422,6 +422,7 @@ public class PurpurWorldConfig {
@@ -423,6 +423,7 @@ public class PurpurWorldConfig {
public boolean playerRidableInWater = false;
public boolean playerRemoveBindingWithWeakness = false;
public int shiftRightClickRepairsMendingPoints = 0;
@@ -48,7 +48,7 @@ index 746faa9d17f1f99ea97eafb22850b02ae81795ad..789eb302e6206666f62bfb49b5f2dbce
private void playerSettings() {
if (PurpurConfig.version < 19) {
boolean oldVal = getBoolean("gameplay-mechanics.player.idle-timeout.mods-target", idleTimeoutTargetPlayer);
@@ -450,6 +451,7 @@ public class PurpurWorldConfig {
@@ -452,6 +453,7 @@ public class PurpurWorldConfig {
playerRidableInWater = getBoolean("gameplay-mechanics.player.ridable-in-water", playerRidableInWater);
playerRemoveBindingWithWeakness = getBoolean("gameplay-mechanics.player.curse-of-binding.remove-with-weakness", playerRemoveBindingWithWeakness);
shiftRightClickRepairsMendingPoints = getInt("gameplay-mechanics.player.shift-right-click-repairs-mending-points", shiftRightClickRepairsMendingPoints);