Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix non-human passengers crashing server

Browse Source
This commit is contained in:
William Blake Galbreath
2019-06-23 22:18:36 -05:00
parent 17a36384eb
commit 5d6c6b7efa
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0011-Integrate-ridables.patch
View File

@@ -1,4 +1,4 @@
From c7360b84c003a6df68bf1f545bf99e3df39d0e9a Mon Sep 17 00:00:00 2001 From b6ebb204ace8f0e1cf99dd9a7bb002a41ef5c096 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 30 Apr 2019 19:17:21 -0500 Date: Tue, 30 Apr 2019 19:17:21 -0500
Subject: [PATCH] Integrate ridables Subject: [PATCH] Integrate ridables
@@ -163,7 +163,7 @@ index 454627f65e..df3d6cf281 100644
this.d = false; this.d = false;
this.a.aM = this.a(this.a.aM, this.h() + 20.0F, this.b); this.a.aM = this.a(this.a.aM, this.h() + 20.0F, this.b);
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 352b6dfb3e..87245d3e12 100644 index 352b6dfb3e..250fec699a 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -78,6 +78,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -78,6 +78,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -199,7 +199,7 @@ index 352b6dfb3e..87245d3e12 100644
} }
- -
+ // Purpur start + // Purpur start
+ if (isRidable && passengers.get(0) == entity) { + if (isRidable && passengers.get(0) == entity && entity instanceof EntityHuman) {
+ EntityHuman entityhuman = (EntityHuman) entity; + EntityHuman entityhuman = (EntityHuman) entity;
+ onMount(entityhuman); + onMount(entityhuman);
+ this.rider = entityhuman; + this.rider = entityhuman;