Upstream
/
Yatopia
mirror of https://github.com/YatopiaMC/Yatopia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix NPE in ControllerLookWASD and ControllerMoveWASD (#380) 

Resolves https://github.com/YatopiaMC/Yatopia/issues/379
Related to https://github.com/xXKeyleXx/MyPet/issues/1425
This commit is contained in:
ishland 2021-02-03 08:02:43 +08:00 committed by GitHub
parent da1e376b10
commit 6f638c7944
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PATCHES.md
View File

@ -165,6 +165,7 @@ This is an overview over all patches that are currently used.
| 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 ControllerLookWASD and ControllerMoveWASD | ishland | |
| server | Fix PlayerEditBookEvent not saving new book | BillyGalbreath | |
| server | Fix cow rotation when shearing mooshroom | William Blake Galbreath | |
| server | Fix death message colors | William Blake Galbreath | |

42
patches/server/0066-Fix-NPE-in-ControllerLookWASD-and-ControllerMoveWASD.patch Normal file
View File

@ -0,0 +1,42 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: ishland <ishlandmc@yeah.net>
Date: Mon, 1 Feb 2021 20:16:36 +0800
Subject: [PATCH] Fix NPE in ControllerLookWASD and ControllerMoveWASD
diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
index 0b16a7b6345ff42ea0f42ca79155a50e2fe4926b..13f54cdda27fb92dcb72f386cefdee457dc86076 100644
--- a/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
+++ b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
@@ -19,8 +19,11 @@ public class ControllerLookWASD extends ControllerLook {
// tick
@Override
public void a() {
- if (entity.hasRider()) {
- tick(entity.getRider());
+ // Yatopia start - better null check - fix NPE with some plugins
+ final EntityHuman rider = entity.getRider();
+ if (rider != null) {
+ tick(rider);
+ // Yatopia end
} else {
tick();
}
diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
index 426688b3a6dc197b41ddc4d1efed0405614f0f3b..66d87e39f42cac1b3e3142ea1ebfee60788d5251 100644
--- a/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
+++ b/src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
@@ -30,8 +30,11 @@ public class ControllerMoveWASD extends ControllerMove {
// tick
@Override
public void a() {
- if (entity.hasRider()) {
- tick(entity.getRider());
+ // Yatopia start - better null check - fix NPE with some plugins
+ final EntityHuman rider = entity.getRider();
+ if (rider != null) {
+ tick(rider);
+ // Yatopia end
} else {
tick();
}