Merge branch 'master' into 1.15
This commit is contained in:
commit
431080eea9
17 files changed
+134
-51
No files matched your search
@@ -38,16 +38,16 @@ public class WoolTool
|
||||
switch (color)
|
||||
{
|
||||
case PINK:
|
||||
if (CarpetSettings.commandSpawn)
|
||||
if (!"false".equals(CarpetSettings.commandSpawn))
|
||||
Messenger.send(placer, SpawnReporter.report(pos, worldIn));
|
||||
|
||||
break;
|
||||
case BLACK:
|
||||
if (CarpetSettings.commandSpawn)
|
||||
if (!"false".equals(CarpetSettings.commandSpawn))
|
||||
Messenger.send(placer, SpawnReporter.show_mobcaps(pos, worldIn));
|
||||
break;
|
||||
case BROWN:
|
||||
if (CarpetSettings.commandDistance)
|
||||
if (!"false".equals(CarpetSettings.commandDistance))
|
||||
{
|
||||
ServerCommandSource source = placer.getCommandSource();
|
||||
if (!DistanceCalculator.hasStartingPoint(source) || placer.isSneaking()) {
|
||||
@@ -59,11 +59,11 @@ public class WoolTool
|
||||
}
|
||||
break;
|
||||
case GRAY:
|
||||
if (CarpetSettings.commandInfo)
|
||||
if (!"false".equals(CarpetSettings.commandInfo))
|
||||
Messenger.send(placer, BlockInfo.blockInfo(pos.down(), worldIn));
|
||||
break;
|
||||
case YELLOW:
|
||||
if (CarpetSettings.commandInfo)
|
||||
if (!"false".equals(CarpetSettings.commandInfo))
|
||||
Messenger.m(placer, "r This used to show entity info around the player. Use data get entity command, sorry");
|
||||
//EntityInfo.issue_entity_info(placer);
|
||||
break;
|
||||
|
||||
Reference in new issue
Block a user