Houston, we got a patch (#2731)

* Houston, we got a patch

* is this the end of the beginning or the beginning of the end
This commit is contained in:
MiniDigger | Martin
2019-12-12 17:20:43 +01:00
parent 12013028b5
commit 3360d06f76
125 changed files with 643 additions and 6035 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement alternative item-despawn-rate
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 56ca65819..b1ad22c9f 100644
index 097b623fd..d0f5b2ab7 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -0,0 +0,0 @@
@@ -80,10 +80,10 @@ index 56ca65819..b1ad22c9f 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index bc7e706d1..df26cef6a 100644
index a0d1e7fd2..e61af3f5e 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -0,0 +0,0 @@ import java.util.List;
@@ -0,0 +0,0 @@ import java.util.Objects;
import java.util.UUID;
import javax.annotation.Nullable;
// CraftBukkit start
@@ -111,8 +111,8 @@ index bc7e706d1..df26cef6a 100644
this.age = 0;
@@ -0,0 +0,0 @@ public class EntityItem extends Entity {
public void u() {
this.p();
public void s() {
this.o();
- this.age = world.spigotConfig.itemDespawnRate - 1; // Spigot
+ this.age = this.getDespawnRate() - 1; // Spigot // Paper
}
@@ -125,6 +125,6 @@ index bc7e706d1..df26cef6a 100644
+ // Paper end
+
@Override
public Packet<?> N() {
public Packet<?> L() {
return new PacketPlayOutSpawnEntity(this);
--