mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-16 00:25:38 +02:00
ea855e2b46
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 Developers!: You will need to clean up your work/Minecraft/1.13.2 folder for this Also, restore a patch that was dropped in the last upstream Bukkit Changes: 279eeab3 Fix command description not being set 96e2bb18 Remove debug print from SyntheticEventTest CraftBukkit Changes:d3ed1516Fix dangerously threaded beacons217a293dDon't relocate joptsimple to allow --help to work.1be05a21Prepare for imminent Java 12 releasea49270b2Mappings Update5259d80cSPIGOT-4669: Fix PlayerTeleportEvent coordinates for relative teleports Spigot Changes: e6eb36f2 Rebuild patches
54 lines
3.1 KiB
Diff
54 lines
3.1 KiB
Diff
From cec81e81be74f02e67f7de151f545126fdb393a0 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Thu, 23 Aug 2018 09:25:30 -0500
|
|
Subject: [PATCH] Fix MC-124320
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
|
|
index c674aa13d..2e460a7f6 100644
|
|
--- a/src/main/java/net/minecraft/server/Block.java
|
|
+++ b/src/main/java/net/minecraft/server/Block.java
|
|
@@ -154,6 +154,7 @@ public class Block implements IMaterial {
|
|
return tag.isTagged(this);
|
|
}
|
|
|
|
+ public static IBlockData getValidBlockForPosition(IBlockData iblockdata, GeneratorAccess generatoraccess, BlockPosition blockposition) { return Block.b(iblockdata, generatoraccess, blockposition); } // Paper - OBFHELPER
|
|
public static IBlockData b(IBlockData iblockdata, GeneratorAccess generatoraccess, BlockPosition blockposition) {
|
|
IBlockData iblockdata1 = iblockdata;
|
|
BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
|
|
diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
|
|
index 139a70ca3..e4aba0e0a 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityEnderman.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java
|
|
@@ -305,8 +305,9 @@ public class EntityEnderman extends EntityMonster {
|
|
if (block.a(TagsBlock.ENDERMAN_HOLDABLE) && flag) {
|
|
// CraftBukkit start - Pickup event
|
|
if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.enderman, blockposition, Blocks.AIR.getBlockData()).isCancelled()) {
|
|
- this.enderman.setCarried(iblockdata);
|
|
+ //this.enderman.setCarried(iblockdata); // Paper - moved down
|
|
world.setAir(blockposition);
|
|
+ this.enderman.setCarried(Block.getValidBlockForPosition(iblockdata, this.enderman.world, blockposition)); // Paper - Fix MC-124320
|
|
}
|
|
// CraftBukkit end
|
|
}
|
|
@@ -316,6 +317,7 @@ public class EntityEnderman extends EntityMonster {
|
|
|
|
static class PathfinderGoalEndermanPlaceBlock extends PathfinderGoal {
|
|
|
|
+ private EntityEnderman getEnderman() { return this.a; } // Paper - OBFHELPER
|
|
private final EntityEnderman a;
|
|
|
|
public PathfinderGoalEndermanPlaceBlock(EntityEnderman entityenderman) {
|
|
@@ -335,7 +337,7 @@ public class EntityEnderman extends EntityMonster {
|
|
BlockPosition blockposition = new BlockPosition(i, j, k);
|
|
IBlockData iblockdata = world.getType(blockposition);
|
|
IBlockData iblockdata1 = world.getType(blockposition.down());
|
|
- IBlockData iblockdata2 = this.a.getCarried();
|
|
+ IBlockData iblockdata2 = Block.getValidBlockForPosition(getEnderman().getCarried(), getEnderman().world, blockposition); // Paper - Fix MC-124320
|
|
|
|
if (iblockdata2 != null && this.a(world, blockposition, iblockdata2, iblockdata, iblockdata1)) {
|
|
// CraftBukkit start - Place event
|
|
--
|
|
2.21.0
|
|
|