mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-09-29 15:47:42 +02:00
b774a5d8a8
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. Purpur Changes: 5cff60d Toggle for water sensitive mobs getting damaged by... water (#161) AirplaneLite Changes: 1b11269 This works, last time f763e5b Keep one patch ca87ae0 Keep empty API directory 53d0334 Rebrand as "Airplane" 1e153e0 Merge pull request #3 from DeadSteve51/patch-1 0829860 Remove actions links 12cc4d7 Adds more info to the README, mostly from the Discord a78a63c Add new downloads URL 2a05c35 Force workflow run
43 lines
1.9 KiB
Diff
43 lines
1.9 KiB
Diff
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();
|
|
}
|