Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-25 12:05:53 +01:00
Code Issues Projects Releases Wiki Activity

Catch plugins setting null Material or BlockData to blocks

Browse Source
This commit is contained in:
md_5 2018-10-13 09:43:05 +11:00
parent 8ab46ff7c6
commit e7ced970d2
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
View File

@ -134,6 +134,7 @@ public class CraftBlock implements Block {
@Override @Override
public void setType(Material type, boolean applyPhysics) { public void setType(Material type, boolean applyPhysics) {
Preconditions.checkArgument(type != null, "Material cannot be null");
setBlockData(type.createBlockData(), applyPhysics); setBlockData(type.createBlockData(), applyPhysics);
} }
@ -144,6 +145,7 @@ public class CraftBlock implements Block {
@Override @Override
public void setBlockData(BlockData data, boolean applyPhysics) { public void setBlockData(BlockData data, boolean applyPhysics) {
Preconditions.checkArgument(data != null, "BlockData cannot be null");
setTypeAndData(((CraftBlockData) data).getState(), applyPhysics); setTypeAndData(((CraftBlockData) data).getState(), applyPhysics);
} }

3
src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
View File

@ -1,5 +1,6 @@
package org.bukkit.craftbukkit.block; package org.bukkit.craftbukkit.block;
import com.google.common.base.Preconditions;
import net.minecraft.server.BlockPosition; import net.minecraft.server.BlockPosition;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.block.Block; import org.bukkit.block.Block;
@ -98,6 +99,7 @@ public class CraftBlockState implements BlockState {
@Override @Override
public void setBlockData(BlockData data) { public void setBlockData(BlockData data) {
Preconditions.checkArgument(data != null, "BlockData cannot be null");
this.data = ((CraftBlockData) data).getState(); this.data = ((CraftBlockData) data).getState();
} }
@ -121,6 +123,7 @@ public class CraftBlockState implements BlockState {
} }
public void setType(final Material type) { public void setType(final Material type) {
Preconditions.checkArgument(type != null, "Material cannot be null");
if (this.getType() != type) { if (this.getType() != type) {
this.data = CraftMagicNumbers.getBlock(type).getBlockData(); this.data = CraftMagicNumbers.getBlock(type).getBlockData();
} }