Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-20 19:04:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor Player::GetPos() -> Player::GetPosition()

Browse Source
This commit is contained in:
Melledy
2022-07-19 00:35:54 -07:00
parent 2e19e70fe1
commit cc5b292bc3
13 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/emu/grasscutter/game/world/Scene.java
View File

@@ -459,7 +459,7 @@ public class Scene {
public synchronized void checkSpawns() {
Set<SpawnDataEntry.GridBlockId> loadedGridBlocks = new HashSet<>();
for (Player player : this.getPlayers()) {
for (SpawnDataEntry.GridBlockId block : SpawnDataEntry.GridBlockId.getAdjacentGridBlockIds(player.getSceneId(), player.getPos()))
for (SpawnDataEntry.GridBlockId block : SpawnDataEntry.GridBlockId.getAdjacentGridBlockIds(player.getSceneId(), player.getPosition()))
loadedGridBlocks.add(block);
}
if (this.loadedGridBlocks.containsAll(loadedGridBlocks)) { // Don't recalculate static spawns if nothing has changed
@@ -555,7 +555,7 @@ public class Scene {
public List<SceneBlock> getPlayerActiveBlocks(Player player){
// consider the borders' entities of blocks, so we check if contains by index
return SceneIndexManager.queryNeighbors(getScriptManager().getBlocksIndex(),
player.getPos().toXZDoubleArray(), Grasscutter.getConfig().server.game.loadEntitiesForPlayerRange);
player.getPosition().toXZDoubleArray(), Grasscutter.getConfig().server.game.loadEntitiesForPlayerRange);
}
public void checkBlocks() {
Set<SceneBlock> visible = new HashSet<>();
@@ -582,7 +582,7 @@ public class Scene {
}else{
// dynamic load the groups for players in a loaded block
var toLoad = this.getPlayers().stream()
.filter(p -> block.contains(p.getPos()))
.filter(p -> block.contains(p.getPosition()))
.map(p -> playerMeetGroups(p, block))
.flatMap(Collection::stream)
.toList();
@@ -592,7 +592,7 @@ public class Scene {
}
public List<SceneGroup> playerMeetGroups(Player player, SceneBlock block){
List<SceneGroup> sceneGroups = SceneIndexManager.queryNeighbors(block.sceneGroupIndex, player.getPos().toDoubleArray(),
List<SceneGroup> sceneGroups = SceneIndexManager.queryNeighbors(block.sceneGroupIndex, player.getPosition().toDoubleArray(),
Grasscutter.getConfig().server.game.loadEntitiesForPlayerRange);
List<SceneGroup> groups = sceneGroups.stream()
@@ -612,7 +612,7 @@ public class Scene {
// the groups form here is not added in current scene
var groups = players.stream()
.filter(player -> block.contains(player.getPos()))
.filter(player -> block.contains(player.getPosition()))
.map(p -> playerMeetGroups(p, block))
.flatMap(Collection::stream)
.toList();
@@ -774,7 +774,7 @@ public class Scene {
this.npcBornEntrySet.addAll(loadNpcForPlayer(player));
}
private List<SceneNpcBornEntry> loadNpcForPlayer(Player player){
var pos = player.getPos();
var pos = player.getPosition();
var data = GameData.getSceneNpcBornData().get(getId());
if(data == null){
return List.of();

6
src/main/java/emu/grasscutter/game/world/World.java
View File

@@ -193,7 +193,7 @@ public class World implements Iterable<Player> {
World world = new World(victim);
world.addPlayer(victim);
victim.sendPacket(new PacketPlayerEnterSceneNotify(victim, EnterType.ENTER_TYPE_SELF, EnterReason.TeamKick, victim.getSceneId(), victim.getPos()));
victim.sendPacket(new PacketPlayerEnterSceneNotify(victim, EnterType.ENTER_TYPE_SELF, EnterReason.TeamKick, victim.getSceneId(), victim.getPosition()));
}
}
}
@@ -249,10 +249,10 @@ public class World implements Iterable<Player> {
// Set player position
if (pos == null) {
pos = player.getPos();
pos = player.getPosition();
}
player.getPos().set(pos);
player.getPosition().set(pos);
if (oldScene != null) {
newScene.setPrevScene(oldScene.getId());