mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
fb64f9a068
Upstream has released updates that appears to apply and compile correctly
Tuinity Changes:
8750b61 Fix entity count in timings and add water-ambient to per world spawn limits
2d9c2c8 Improve concurrent UserCache access
22 lines
1.1 KiB
Diff
22 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sat, 8 Feb 2020 23:30:17 -0600
|
|
Subject: [PATCH] World#getPlacementBlockData
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
index 94fad039f1..2577a41c92 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
@@ -2621,5 +2621,10 @@ public class CraftWorld implements World {
|
|
public net.pl3x.purpur.MoonPhase getMoonPhase() {
|
|
return net.pl3x.purpur.MoonPhase.getPhase(getFullTime() / 24000L);
|
|
}
|
|
+
|
|
+ public BlockData getPlacementBlockData(BlockData blockdata, Location location) {
|
|
+ IBlockData validData = net.minecraft.server.Block.getValidBlockForPosition(((CraftBlockData) blockdata).getState(), getHandle(), net.minecraft.server.MCUtil.toBlockPosition(location));
|
|
+ return CraftBlockData.fromData(validData == null ? Blocks.AIR.getBlockData() : validData);
|
|
+ }
|
|
// Purpur end
|
|
}
|