sen/tcr
sen/tcr
1
0
Fork 0
Code Issues Pull requests Activity

use latest Netty and Guava

Browse source
This commit is contained in:
Sen 2025-03-16 17:40:47 +01:00
parent 7f32e87ef4
commit 3af1b1f5b6
463 changed files with 611 additions and 68249 deletions
Download patch file Download diff file Expand all files Collapse all files

13
java/src/game/network/NetHandlerPlayServer.java
View file

@ -6,7 +6,10 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
import java.util.function.Predicate;
import com.google.common.base.Predicate;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.Futures;
import game.Server;
import game.block.Block;
@ -19,7 +22,6 @@ import game.clipboard.ClipboardPlacer;
import game.clipboard.Rotation;
import game.clipboard.RotationValue;
import game.clipboard.Vector;
import game.collect.Lists;
import game.color.TextColor;
import game.dimension.Dimension;
import game.entity.Entity;
@ -31,7 +33,6 @@ import game.entity.npc.EntityHuman;
import game.entity.npc.EntityNPC;
import game.entity.projectile.EntityArrow;
import game.entity.types.EntityLiving;
import game.future.Futures;
import game.init.BlockRegistry;
import game.init.Config;
import game.init.Config.ValueType;
@ -57,8 +58,6 @@ import game.material.Material;
import game.nbt.NBTTagCompound;
import game.nbt.NBTTagList;
import game.nbt.NBTTagString;
import game.net.util.concurrent.Future;
import game.net.util.concurrent.GenericFutureListener;
import game.packet.CPacketAction;
import game.packet.CPacketBook;
import game.packet.CPacketBreak;
@ -123,6 +122,8 @@ import game.world.State;
import game.world.Vec3i;
import game.world.World;
import game.world.WorldServer;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.GenericFutureListener;
public class NetHandlerPlayServer extends NetHandler implements ICrafting
{
@ -2685,7 +2686,7 @@ public class NetHandlerPlayServer extends NetHandler implements ICrafting
case MAGNET:
if(this.isAdmin()) {
List<Entity> list = this.entity.worldObj.getEntitiesWithinAABB(Entity.class, new BoundingBox(this.entity.getPosition().subtract(new BlockPos(128, 128, 128)), this.entity.getPosition().add(new BlockPos(128, 128, 128))), new Predicate<Entity>() {
public boolean test(Entity entity) {
public boolean apply(Entity entity) {
return entity.isEntityAlive() && (entity instanceof EntityItem || entity instanceof EntityXp);
}
});