Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2024-11-25 12:05:14 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream and Sidestream(s) (Tuinity) (#433)

Browse Source 
Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Tuinity Changes:
81d5fc1 Fix NPE in pickup logic for arrow
This commit is contained in:
Simon Gardling 2021-03-11 13:16:47 -05:00 committed by GitHub
parent 49ca7baf58
commit aa9e616c42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PATCHES.md
View File

@ -182,6 +182,7 @@ # Patches
| server | Fix Bukkit.createInventory() with type LECTERN | willies952002 | |
| server | Fix IndexOutOfBoundsException when sending too many changes | Ivan Pekov | |
| server | Fix LightEngineThreaded memory leak | Ivan Pekov | |
| server | Fix NPE in pickup logic for arrow | Spottedleaf | |
| server | Fix PlayerEditBookEvent not saving new book | BillyGalbreath | |
| server | Fix chunks refusing to unload at low TPS | Spottedleaf | |
| server | Fix cow rotation when shearing mooshroom | William Blake Galbreath | |

2
patches/Purpur/patches/server/0109-Despawn-rate-config-options-per-projectile-type.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Despawn rate config options per projectile type
Default values of -1 respect vanilla behaviour.
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index f983516b89cdf7ce7fdea8f5a5b1a29dd01ae597..74529a297540ea9c69952d88fe3bb5a13816dcef 100644
index 77ddda8bd5b8a37ed51324e9769da4978173e744..10cbddae4ede09ccec3b9c459c09fa18e2211238 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -23,7 +23,7 @@ public abstract class EntityArrow extends IProjectile {

2
patches/Purpur/patches/server/0119-Arrows-should-not-reset-despawn-counter.patch
View File

@ -7,7 +7,7 @@ This prevents keeping arrows alive indefinitely (such as when the block
the arrow is stuck in gets removed, like a piston head going up/down)
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index 74529a297540ea9c69952d88fe3bb5a13816dcef..2e11286e2baffa66bea9570b0377478cd45fac1e 100644
index 10cbddae4ede09ccec3b9c459c09fa18e2211238..ed662d59384a718a56149ea24f01115f62c30d91 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -245,7 +245,7 @@ public abstract class EntityArrow extends IProjectile {

21
patches/Tuinity/patches/server/0071-Fix-NPE-in-pickup-logic-for-arrow.patch Normal file
View File

@ -0,0 +1,21 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Thu, 11 Mar 2021 09:50:39 -0800
Subject: [PATCH] Fix NPE in pickup logic for arrow
Apparently the shooter can be null for tridents returning to players.
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index f983516b89cdf7ce7fdea8f5a5b1a29dd01ae597..77ddda8bd5b8a37ed51324e9769da4978173e744 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -509,7 +509,8 @@ public abstract class EntityArrow extends IProjectile {
}
itemstack = item.getItemStack();
}
- boolean flag = this.fromPlayer == EntityArrow.PickupStatus.ALLOWED || this.fromPlayer == EntityArrow.PickupStatus.CREATIVE_ONLY && entityhuman.abilities.canInstantlyBuild || this.t() && this.getShooter().getUniqueID() == entityhuman.getUniqueID();
+ Entity shooter; // Tuinity - fix NPE here
+ boolean flag = this.fromPlayer == EntityArrow.PickupStatus.ALLOWED || this.fromPlayer == EntityArrow.PickupStatus.CREATIVE_ONLY && entityhuman.abilities.canInstantlyBuild || this.t() && ((shooter = this.getShooter()) != null && shooter.getUniqueID() == entityhuman.getUniqueID()); // Tuinity - fix NPE here
if (this.fromPlayer == EntityArrow.PickupStatus.ALLOWED && !entityhuman.inventory.pickup(itemstack)) {
// CraftBukkit end

2
upstream/Tuinity

@ -1 +1 @@
Subproject commit 19ac6608f3035459bfbad0059f342d719c9050a3
Subproject commit 81d5fc1ddf28df83a564ef32f244e3ebe121b210

2
upstreamCommits/Tuinity
View File

@ -1 +1 @@
19ac6608f3035459bfbad0059f342d719c9050a3
81d5fc1ddf28df83a564ef32f244e3ebe121b210