Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Test if broadcasting apollo:json acceptance triggers ModList sending.

Browse Source
This commit is contained in:
Lixfel
2024-12-11 14:48:32 +01:00
parent 68c7cfed73
commit c308a06e6b
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FightSystem/FightSystem_18/src/de/steamwar/fightsystem/utils/BlockIdWrapper18.java
+2 -5
View File
@@ -23,10 +23,7 @@ import com.comphenix.tinyprotocol.Reflection;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.Collections; import java.util.*;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
public class BlockIdWrapper18 extends BlockIdWrapper14 { public class BlockIdWrapper18 extends BlockIdWrapper14 {
@@ -39,7 +36,7 @@ public class BlockIdWrapper18 extends BlockIdWrapper14 {
@Override @Override
public void untrackEntity(Player player, Entity entity) { public void untrackEntity(Player player, Entity entity) {
hiddenEntities.get(player).put(entity.getUniqueId(), Collections.emptySet()); hiddenEntities.get(player).put(entity.getUniqueId(), new HashSet<>(1));
super.untrackEntity(player, entity); super.untrackEntity(player, entity);
} }
} }
FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Hull.java
-6
View File
@@ -51,7 +51,6 @@ public class Hull {
private final BitSet occluding; private final BitSet occluding;
private final BitSet visibility; private final BitSet visibility;
private final BitSet primaryVisible;
private final Int2IntOpenHashMap visibilityDirections = new Int2IntOpenHashMap(); // Contains the visible directions of each occluding visible block private final Int2IntOpenHashMap visibilityDirections = new Int2IntOpenHashMap(); // Contains the visible directions of each occluding visible block
private final Set<IntVector> uncoveredSurface = new HashSet<>(); private final Set<IntVector> uncoveredSurface = new HashSet<>();
@@ -65,7 +64,6 @@ public class Hull {
this.primaryDirection = new IntVector(0, 0, team.isBlue() == (Config.BlueToRedZ > 0) ? -1 : 1); this.primaryDirection = new IntVector(0, 0, team.isBlue() == (Config.BlueToRedZ > 0) ? -1 : 1);
this.occluding = new BitSet(region.volume()); this.occluding = new BitSet(region.volume());
this.visibility = new BitSet(region.volume()); this.visibility = new BitSet(region.volume());
this.primaryVisible = new BitSet(region.volume());
branchDirections = IntStream.range(0, 27) branchDirections = IntStream.range(0, 27)
.mapToObj(v -> new IntVector(v%3 -1, (v/3)%3 -1, v/9 -1)) .mapToObj(v -> new IntVector(v%3 -1, (v/3)%3 -1, v/9 -1))
@@ -139,7 +137,6 @@ public class Hull {
visibility.clear(); visibility.clear();
occluding.clear(); occluding.clear();
visibilityDirections.clear(); visibilityDirections.clear();
primaryVisible.clear();
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
region.forEach((x, y, z) -> { region.forEach((x, y, z) -> {
@@ -253,14 +250,11 @@ public class Hull {
visibilityDirections.compute(id, (pos, v) -> (v == null ? 0 : v) | directionId(direction)); visibilityDirections.compute(id, (pos, v) -> (v == null ? 0 : v) | directionId(direction));
return; return;
} }
if(primaryVisible.get(id))
return;
updateBlocks(uncovered, block.add(direction), direction); updateBlocks(uncovered, block.add(direction), direction);
if(!direction.equals(primaryDirection)) if(!direction.equals(primaryDirection))
return; return;
primaryVisible.set(id);
for(IntVector branchDirection : branchDirections) for(IntVector branchDirection : branchDirections)
updateBlocks(uncovered, block.add(branchDirection), branchDirection); updateBlocks(uncovered, block.add(branchDirection), branchDirection);
} }