fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.15 port

Browse Source
This commit is contained in:
yueh
2020-05-18 14:02:45 +02:00
parent 0ea86c939c
commit 16d6d55d7f
630 changed files with 4211 additions and 12664 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/me/cache/PathGridCache.java
Vendored
+5 -5
View File
@@ -26,8 +26,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerEntityMP;
import appeng.api.AEApi;
import appeng.api.networking.GridFlags;
@@ -351,10 +351,10 @@ public class PathGridCache implements IPathingGrid
{
for( final IGridNode n : this.requireChannels )
{
EntityPlayer player = AEApi.instance().registries().players().findPlayer( n.getPlayerID() );
if( player instanceof EntityPlayerMP )
PlayerEntity player = AEApi.instance().registries().players().findPlayer( n.getPlayerID() );
if( player instanceof PlayerEntityMP )
{
currentBracket.trigger( (EntityPlayerMP) player );
currentBracket.trigger( (PlayerEntityMP) player );
}
}
}
src/main/java/appeng/me/cache/SecurityCache.java
Vendored
+2 -2
View File
@@ -27,7 +27,7 @@ import java.util.List;
import com.google.common.base.Preconditions;
import com.mojang.authlib.GameProfile;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.PlayerEntity;
import appeng.api.config.SecurityPermissions;
import appeng.api.networking.IGrid;
@@ -150,7 +150,7 @@ public class SecurityCache implements ISecurityGrid
}
@Override
public boolean hasPermission( final EntityPlayer player, final SecurityPermissions perm )
public boolean hasPermission( final PlayerEntity player, final SecurityPermissions perm )
{
Preconditions.checkNotNull( player );
Preconditions.checkNotNull( perm );