57dd397155
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes: 77fd87e4 SPIGOT-2304: Implement LootGenerateEvent a1a705ee SPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent 41712edd SPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
59 lines
2.5 KiB
Diff
59 lines
2.5 KiB
Diff
From d86f5b06729e26846af2f19d5a38d7b33da26f53 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sun, 26 Jan 2020 16:30:19 -0600
|
|
Subject: [PATCH] Bees get gravity in void. Fixes MC-167279
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/ControllerMove.java b/src/main/java/net/minecraft/server/ControllerMove.java
|
|
index 7e3671dae6..a5c4cbb67f 100644
|
|
--- a/src/main/java/net/minecraft/server/ControllerMove.java
|
|
+++ b/src/main/java/net/minecraft/server/ControllerMove.java
|
|
@@ -2,7 +2,7 @@ package net.minecraft.server;
|
|
|
|
public class ControllerMove {
|
|
|
|
- protected final EntityInsentient a;
|
|
+ protected final EntityInsentient a; public EntityInsentient getEntity() { return a; } // Paper - OBFHELPER
|
|
protected double b;
|
|
protected double c;
|
|
protected double d;
|
|
diff --git a/src/main/java/net/minecraft/server/ControllerMoveFlying.java b/src/main/java/net/minecraft/server/ControllerMoveFlying.java
|
|
index 2b6ac2eeb0..0496c0c5db 100644
|
|
--- a/src/main/java/net/minecraft/server/ControllerMoveFlying.java
|
|
+++ b/src/main/java/net/minecraft/server/ControllerMoveFlying.java
|
|
@@ -12,7 +12,7 @@ public class ControllerMoveFlying extends ControllerMove {
|
|
}
|
|
|
|
@Override
|
|
- public void a() {
|
|
+ public void a() { tick(); } public void tick() { // Paper - OBFHELPER
|
|
if (this.h == ControllerMove.Operation.MOVE_TO) {
|
|
this.h = ControllerMove.Operation.WAIT;
|
|
this.a.setNoGravity(true);
|
|
diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java
|
|
index 73e0162578..c7d79efdf6 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityBee.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityBee.java
|
|
@@ -36,7 +36,17 @@ public class EntityBee extends EntityAnimal implements EntityBird {
|
|
|
|
public EntityBee(EntityTypes<? extends EntityBee> entitytypes, World world) {
|
|
super(entitytypes, world);
|
|
- this.moveController = new ControllerMoveFlying(this, 20, true);
|
|
+ // Paper start - apply gravity to bees when they get stuck in the void, fixes MC-167279
|
|
+ this.moveController = new ControllerMoveFlying(this, 20, true) {
|
|
+ @Override
|
|
+ public void tick() {
|
|
+ if (getEntity().locY() <= 0) {
|
|
+ getEntity().setNoGravity(false);
|
|
+ }
|
|
+ super.tick();
|
|
+ }
|
|
+ };
|
|
+ // Paper end
|
|
this.lookController = new EntityBee.j(this);
|
|
this.a(PathType.WATER, -1.0F);
|
|
this.a(PathType.COCOA, -1.0F);
|
|
--
|
|
2.26.2
|
|
|