Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-12-25 18:17:37 +01:00
Code Issues Projects Releases Wiki Activity

Fix 'waterlogged' blocks in Forge 1.13.2+

Browse Source
This commit is contained in:
Mike Primm 2020-06-07 18:11:03 -05:00
parent 32a0ad0c86
commit 7c0b515272
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
forge-1.13.2/src/main/java/org/dynmap/forge_1_13_2/DynmapPlugin.java
View File

@ -27,6 +27,7 @@ import java.util.concurrent.FutureTask;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockFlowingFluid;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.command.CommandException; import net.minecraft.command.CommandException;
@ -35,6 +36,7 @@ import net.minecraft.command.Commands;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.fluid.IFluidState;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.network.NetHandlerPlayServer;
@ -241,6 +243,9 @@ public class DynmapPlugin
if (mat == Material.LEAVES) { if (mat == Material.LEAVES) {
dbs.setLeaves(); dbs.setLeaves();
} }
if ((!bs.getFluidState().isEmpty()) && !(bs.getBlock() instanceof BlockFlowingFluid)) {
dbs.setWaterlogged();
}
} }
} }
for (int gidx = 0; gidx < DynmapBlockState.getGlobalIndexMax(); gidx++) { for (int gidx = 0; gidx < DynmapBlockState.getGlobalIndexMax(); gidx++) {

4
forge-1.14.4/src/main/java/org/dynmap/forge_1_14_4/DynmapPlugin.java
View File

@ -28,6 +28,7 @@ import java.util.regex.Pattern;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.FlowingFluidBlock;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.command.CommandException; import net.minecraft.command.CommandException;
import net.minecraft.command.CommandSource; import net.minecraft.command.CommandSource;
@ -268,6 +269,9 @@ public class DynmapPlugin
if (mat == Material.LEAVES) { if (mat == Material.LEAVES) {
dbs.setLeaves(); dbs.setLeaves();
} }
if ((!bs.getFluidState().isEmpty()) && !(bs.getBlock() instanceof FlowingFluidBlock)) {
dbs.setWaterlogged();
}
} }
} }
for (int gidx = 0; gidx < DynmapBlockState.getGlobalIndexMax(); gidx++) { for (int gidx = 0; gidx < DynmapBlockState.getGlobalIndexMax(); gidx++) {

4
forge-1.15.2/src/main/java/org/dynmap/forge_1_15_2/DynmapPlugin.java
View File

@ -28,6 +28,7 @@ import java.util.regex.Pattern;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.FlowingFluidBlock;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.command.CommandException; import net.minecraft.command.CommandException;
import net.minecraft.command.CommandSource; import net.minecraft.command.CommandSource;
@ -269,6 +270,9 @@ public class DynmapPlugin
if (mat == Material.LEAVES) { if (mat == Material.LEAVES) {
dbs.setLeaves(); dbs.setLeaves();
} }
if ((!bs.getFluidState().isEmpty()) && !(bs.getBlock() instanceof FlowingFluidBlock)) {
dbs.setWaterlogged();
}
} }
} }
for (int gidx = 0; gidx < DynmapBlockState.getGlobalIndexMax(); gidx++) { for (int gidx = 0; gidx < DynmapBlockState.getGlobalIndexMax(); gidx++) {