Yuyu_First/SrWildEntity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加了权重判定，并且修复了玩家退出登录后再登录后dsp clear实体会刷不掉一些实体的bug

Browse Source
This commit is contained in:
yuyu 2024-04-14 22:31:39 +08:00
parent 29da41875e
commit 3ca0f1f960
7 changed files with 49 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/yuyu/srwildentity/config/ConfigManager.java
View File

@ -51,4 +51,5 @@ public class ConfigManager {
public int getTotal() {
return total;
}
}

3
src/main/java/com/yuyu/srwildentity/config/condition/BiomeEntityRefreshSettings.java
View File

@ -57,8 +57,9 @@ public class BiomeEntityRefreshSettings {
int yMin = config.getInt(biomeName+"."+entityName+".yMin");
int riskMax = config.getInt(biomeName+"."+entityName+".riskMax");
int riskMin = config.getInt(biomeName+"."+entityName+".riskMin");
double weight = config.getDouble(biomeName+"."+entityName+".weight");
EntityCondition entityCondition = new EntityCondition(entityName, biomeName,
spawnEntityType,entitySite, light, stime,etime, nums, yMax, yMin,riskMax,riskMin);
spawnEntityType,entitySite, light, stime,etime, nums, yMax, yMin,riskMax,riskMin,weight);
plugin.getLogger().info(ChatColor.AQUA+entityCondition.toString());

11
src/main/java/com/yuyu/srwildentity/config/condition/EntityCondition.java
View File

@ -22,8 +22,11 @@ public class EntityCondition {
private final int yMin;
private final int riskMax;
private final int riskMin;
private final double weight;
public EntityCondition(String entityName, String biome, SpawnEntityType spawnEntityType, EntitySite entitySite, int light, long startTiming, long endTiming, int nums, int yMax, int yMin,int riskMax,int riskMin) {
public EntityCondition(String entityName, String biome, SpawnEntityType spawnEntityType, EntitySite entitySite,
int light, long startTiming, long endTiming, int nums,
int yMax, int yMin,int riskMax,int riskMin, double weight) {
this.entityName = entityName;
this.biome = biome;
this.spawnEntityType = spawnEntityType;
@ -36,6 +39,7 @@ public class EntityCondition {
this.yMin = yMin;
this.riskMax = riskMax;
this.riskMin = riskMin;
this.weight = weight;
}
public SpawnEntityType getSpawnEntityType() {
@ -90,6 +94,10 @@ public class EntityCondition {
return yMin;
}
public double getWeight() {
return weight;
}
@Override
public String toString() {
return "EntityCondition{" +
@ -105,6 +113,7 @@ public class EntityCondition {
", yMin=" + yMin +
", riskMax=" + riskMax +
", riskMin=" + riskMin +
", weight=" + weight +
'}';
}
}

45
src/main/java/com/yuyu/srwildentity/listener/EntityRefreshListener.java
View File

@ -243,20 +243,19 @@ public class EntityRefreshListener implements Listener, CommandExecutor {
* @param event
*/
@EventHandler
public void onPlayerOffOnline(PlayerQuitEvent event){
if (flag) {
public void onPlayerOffOnline(PlayerQuitEvent event) {
if (flag) {
Player player = event.getPlayer();
String name = player.getName();
//下线后移出刷新列表
if (refreshPlayer.get(name) != null) {
List<UUID> entityList = refreshPlayer.get(name).getEntityList();
for (UUID uuid : entityList){
//删除储存的实体信息
entityUUIDToPlayer.remove(uuid);
}
refreshPlayer.remove(name);
logger.info(ChatColor.GOLD + "玩家被移出刷新集合");
}
// if (refreshPlayer.get(name) != null) {
// List<UUID> entityList = refreshPlayer.get(name).getEntityList();
// for (UUID uuid : entityList){
// //删除储存的实体信息
// entityUUIDToPlayer.remove(uuid);
// }
refreshPlayer.remove(name);
logger.info(ChatColor.GOLD + "玩家被移出刷新集合");
}
}
@ -295,7 +294,9 @@ public class EntityRefreshListener implements Listener, CommandExecutor {
//通过uuid获取对应的玩家姓名,然后通过玩家姓名获取对应的list集合
String name = entityUUIDToPlayer.get(uniqueId);
refreshPlayer.get(name).delEntityList(uniqueId);
if (refreshPlayer.containsKey(name)) {
refreshPlayer.get(name).delEntityList(uniqueId);
}
}
}
}
@ -311,6 +312,7 @@ public class EntityRefreshListener implements Listener, CommandExecutor {
if (noRefreshPlayer.contains(name)){
continue;
}
int attempts = 0;
int sum = 0;//用于记录此次刷新生成的总数
//获取玩家信息
Player player = plugin.getServer().getPlayer(name);
@ -363,6 +365,11 @@ public class EntityRefreshListener implements Listener, CommandExecutor {
continue;
}
if (random.nextFloat() > entityCondition.getWeight()){
//刷新不通过,进入下一个验证的实体
continue;
}
int nums = entityCondition.getNums();//当前实体需要刷新的数量
for (int i = 0;i<nums &&
@ -488,11 +495,25 @@ public class EntityRefreshListener implements Listener, CommandExecutor {
if (entityUUIDToPlayer.containsKey(uuid)){
entityUUIDToPlayer.remove(uuid);
}
}else {
if (entityUUIDToPlayer.containsKey(uuid)){
entityUUIDToPlayer.remove(uuid);
}
}
}
//entity清除完后
refreshPlayer.get(name).setEntityList(new ArrayList<>());
}
for (UUID uuid : entityUUIDToPlayer.keySet()){
Entity entity = plugin.getServer().getEntity(uuid);
if (entity != null){
entity.remove();
entityUUIDToPlayer.remove(uuid);
}else {
entityUUIDToPlayer.remove(uuid);
}
}
}
public void playerRefreshEntiyt(String name){

2
src/main/resources/config.yml
View File

@ -1,3 +1,3 @@
RefreshTime: 10 #刷新时间，单位为s
total: 12 #每个玩家每次刷新的实体数量
num: 4 #单次刷新的最大数量，每RefreshTime秒刷新的数量
num: 4 #单次刷新的最大数量，每RefreshTime秒刷新的数量

1
src/main/resources/entityCondition.yml
View File

@ -10,6 +10,7 @@ DESERT:
yMin: 60 #最小刷新高度
riskMax: 10 #刷新危险度的范围
riskMin: 0 #条件是小于等于riskMin大于riskMax，即riskMin<= risklevel < riskMax 才会刷新
weight: 1.0 #权重越高，刷新的概率越高，最高为1.0
ROOFED_FOREST:
ZOMBIE: #指出entity在该群系的刷新条件
type: 0 #0表示生成mc原生实体，1表示生成MM怪物，2表示生成萌芽怪物

2
target/classes/config.yml
View File

@ -1,3 +1,3 @@
RefreshTime: 10 #刷新时间，单位为s
total: 12 #每个玩家每次刷新的实体数量
num: 4 #单次刷新的数量，每RefreshTime秒刷新的数量
num: 4 #单次刷新的最大数量，每RefreshTime秒刷新的数量