Fix a NPE with brush using a global mask and no brush mask

This commit is contained in:
aumgn 2012-03-15 16:42:56 +01:00
parent fcd792191a
commit d82111a4fc

View File

@ -177,6 +177,7 @@ public class BrushTool implements TraceTool {
BlockBag bag = session.getBlockBag(player); BlockBag bag = session.getBlockBag(player);
EditSession editSession = session.createEditSession(player); EditSession editSession = session.createEditSession(player);
if (mask != null) {
Mask existingMask = editSession.getMask(); Mask existingMask = editSession.getMask();
if (existingMask == null) { if (existingMask == null) {
editSession.setMask(mask); editSession.setMask(mask);
@ -187,6 +188,7 @@ public class BrushTool implements TraceTool {
newMask.add(mask); newMask.add(mask);
editSession.setMask(newMask); editSession.setMask(newMask);
} }
}
try { try {
brush.build(editSession, target, material, size); brush.build(editSession, target, material, size);