Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
7329e19c Updated Upstream (CraftBukkit)
b3a97d14 Fix startup errors when double clicking jar (#2903)
b51fbefc Revert "Fix errors on startup when double clicking jar (#2901)"
a0438fab Fix errors on startup when double clicking jar (#2901)
e0da6d4b Seed based feature search (Fixes #2312) (#2852)
78dfb77e Updated Upstream (Bukkit/CraftBukkit)
969ef51a Init legacy material data
c4714909 Fix items vanishing through end portal (Resolves #2681) (#2894)
74b0ef39 Updated Upstream (CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-01-25 02:35:47 -06:00
parent 0118e083d1
commit 8f99ddb050
8 changed files with 24 additions and 24 deletions

View File

@@ -1,4 +1,4 @@
From f6ead952367f2367164bdf5592a8957f4c267827 Mon Sep 17 00:00:00 2001
From d0783acf1d4f859da0f39bd0f9c36fa502734160 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Dec 2019 22:08:37 -0600
Subject: [PATCH] Add player death exp control options
@@ -9,10 +9,10 @@ Subject: [PATCH] Add player death exp control options
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 5991a41c1..b6459cd47 100644
index 7b54b02e2..69ac51935 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1859,9 +1859,18 @@ public abstract class EntityHuman extends EntityLiving {
@@ -1866,9 +1866,18 @@ public abstract class EntityHuman extends EntityLiving {
@Override
protected int getExpValue(EntityHuman entityhuman) {
if (!this.world.getGameRules().getBoolean(GameRules.KEEP_INVENTORY) && !this.isSpectator()) {