mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-01-15 11:45:42 +00:00
Code Issues Releases Wiki Activity

Use Minecraft's "can use command blocks" check

Browse Source 
Just means we're a little more consistent, and hopefully can remove
canPlayerUseCommands in the future, once Plethora stops using it.
This commit is contained in:
SquidDev 2019-03-16 01:54:11 +00:00
parent 41429bdc0b
commit cbfd5aeeee
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/dan200/computercraft/ComputerCraft.java
View File

@ -386,16 +386,6 @@ public class ComputerCraft
return new File( getBaseDir(), "resourcepacks" ); return new File( getBaseDir(), "resourcepacks" );
} }
public static boolean canPlayerUseCommands( EntityPlayer player )
{
MinecraftServer server = player.getServer();
if( server != null )
{
return server.getPlayerList().canSendCommands( player.getGameProfile() );
}
return false;
}
@Deprecated @Deprecated
public static void registerPermissionProvider( ITurtlePermissionProvider provider ) public static void registerPermissionProvider( ITurtlePermissionProvider provider )
{ {
@ -730,5 +720,12 @@ public class ComputerCraft
{ {
return Peripherals.getPeripheral( world, pos, side ); return Peripherals.getPeripheral( world, pos, side );
} }
@Deprecated
public static boolean canPlayerUseCommands( EntityPlayer player )
{
MinecraftServer server = player.getServer();
return server != null && server.getPlayerList().canSendCommands( player.getGameProfile() );
}
//endregion //endregion
} }

2
src/main/java/dan200/computercraft/shared/command/ContainerViewComputer.java
View File

@ -57,7 +57,7 @@ public class ContainerViewComputer extends Container implements IContainerComput
player.sendMessage( new TextComponentTranslation( "advMode.notEnabled" ) ); player.sendMessage( new TextComponentTranslation( "advMode.notEnabled" ) );
return false; return false;
} }
else if( !ComputerCraft.canPlayerUseCommands( player ) || !player.capabilities.isCreativeMode ) else if( !player.canUseCommandBlock() )
{ {
player.sendMessage( new TextComponentTranslation( "advMode.notAllowed" ) ); player.sendMessage( new TextComponentTranslation( "advMode.notAllowed" ) );
return false; return false;

10
src/main/java/dan200/computercraft/shared/computer/blocks/TileCommandComputer.java
View File

@ -176,14 +176,14 @@ public class TileCommandComputer extends TileComputer
player.sendMessage( new TextComponentTranslation( "advMode.notEnabled" ) ); player.sendMessage( new TextComponentTranslation( "advMode.notEnabled" ) );
return false; return false;
} }
else if( ComputerCraft.canPlayerUseCommands( player ) && player.capabilities.isCreativeMode ) else if( !player.canUseCommandBlock() )
{
return super.isUsable( player, ignoreRange );
}
else
{ {
player.sendMessage( new TextComponentTranslation( "advMode.notAllowed" ) ); player.sendMessage( new TextComponentTranslation( "advMode.notAllowed" ) );
return false; return false;
} }
else
{
return super.isUsable( player, ignoreRange );
}
} }
} }