Updated Upstream ()

Upstream has released updates that appear to apply and compile correctly
This commit is contained in:
BillyGalbreath
2022-11-13 04:52:10 -06:00
parent f72fd9b28b
commit 85bc4a4a83
18 changed files with 52 additions and 52 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add player death exp control options
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 74ef0579739cdc6961718dd2d2b34752f172ed73..df34e5332a6d9c36cad89bac72b5f27892c6192a 100644
index 265d6b766001cdb8e8b9bc8538119637dd92cd17..2f93121c00c36d389958608cf576af3f1cd7e0ab 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -1988,9 +1988,18 @@ public abstract class Player extends LivingEntity {
@@ -1997,9 +1997,18 @@ public abstract class Player extends LivingEntity {
@Override
public int getExperienceReward() {
if (!this.level.getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY) && !this.isSpectator()) {