Upstream/EntityTrackerFixer
1
0
Fork 0
mirror of https://github.com/Elecast2/EntityTrackerFixer.git synced 2025-02-18 03:11:20 +01:00
Code Issues Projects Releases Wiki Activity

apply lastest changes to 1.14 and 1.15

Browse Source
This commit is contained in:
Esmorall 2020-07-02 11:21:56 -03:00
parent 370af0f6f7
commit 45f26c28e9
No known key found for this signature in database
GPG Key ID: 3F4DD7CEC746EEB3
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EntityTrackerFixer/plugin.yml
View File

@ -1,6 +1,6 @@
name: EntityTrackerFixer name: EntityTrackerFixer
main: net.minemora.entitytrackerfixer.EntityTrackerFixer main: net.minemora.entitytrackerfixer.EntityTrackerFixer
version: 1.2.6 version: 1.2.7
api-version: 1.14 api-version: 1.14
author: Esmorall author: Esmorall
description: Untrack entities that are not used at all by the server. description: Untrack entities that are not used at all by the server.

3
EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_14_R1/NMSEntityTracker.java
View File

@ -29,9 +29,6 @@ public final class NMSEntityTracker {
public static void trackEntities(ChunkProviderServer cps, Set<net.minecraft.server.v1_14_R1.Entity> trackList) { public static void trackEntities(ChunkProviderServer cps, Set<net.minecraft.server.v1_14_R1.Entity> trackList) {
try { try {
for(net.minecraft.server.v1_14_R1.Entity entity : trackList) { for(net.minecraft.server.v1_14_R1.Entity entity : trackList) {
if(cps.playerChunkMap.trackedEntities.containsKey(entity.getId())) {
continue;
}
addEntityMethod.invoke(cps.playerChunkMap, entity); addEntityMethod.invoke(cps.playerChunkMap, entity);
} }
} catch (SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { } catch (SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {

4
EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_14_R1/tasks/CheckTask.java
View File

@ -39,6 +39,10 @@ public class CheckTask extends BukkitRunnable {
int d = ConfigMain.getTrackingRange(); int d = ConfigMain.getTrackingRange();
for(Player player : Bukkit.getWorld(worldName).getPlayers()) { for(Player player : Bukkit.getWorld(worldName).getPlayers()) {
for(Entity ent : player.getNearbyEntities(d, d, d)) { for(Entity ent : player.getNearbyEntities(d, d, d)) {
net.minecraft.server.v1_14_R1.Entity nms = ((CraftEntity)ent).getHandle();
if(cps.playerChunkMap.trackedEntities.containsKey(nms.getId()) || !nms.valid) {
continue;
}
trackAgain.add(((CraftEntity)ent).getHandle()); trackAgain.add(((CraftEntity)ent).getHandle());
} }
} }

3
EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_15_R1/NMSEntityTracker.java
View File

@ -29,9 +29,6 @@ public final class NMSEntityTracker {
public static void trackEntities(ChunkProviderServer cps, Set<net.minecraft.server.v1_15_R1.Entity> trackList) { public static void trackEntities(ChunkProviderServer cps, Set<net.minecraft.server.v1_15_R1.Entity> trackList) {
try { try {
for(net.minecraft.server.v1_15_R1.Entity entity : trackList) { for(net.minecraft.server.v1_15_R1.Entity entity : trackList) {
if(cps.playerChunkMap.trackedEntities.containsKey(entity.getId())) {
continue;
}
addEntityMethod.invoke(cps.playerChunkMap, entity); addEntityMethod.invoke(cps.playerChunkMap, entity);
} }
} catch (SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { } catch (SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {

4
EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_15_R1/tasks/CheckTask.java
View File

@ -39,6 +39,10 @@ public class CheckTask extends BukkitRunnable {
int d = ConfigMain.getTrackingRange(); int d = ConfigMain.getTrackingRange();
for(Player player : Bukkit.getWorld(worldName).getPlayers()) { for(Player player : Bukkit.getWorld(worldName).getPlayers()) {
for(Entity ent : player.getNearbyEntities(d, d, d)) { for(Entity ent : player.getNearbyEntities(d, d, d)) {
net.minecraft.server.v1_15_R1.Entity nms = ((CraftEntity)ent).getHandle();
if(cps.playerChunkMap.trackedEntities.containsKey(nms.getId()) || !nms.valid) {
continue;
}
trackAgain.add(((CraftEntity)ent).getHandle()); trackAgain.add(((CraftEntity)ent).getHandle());
} }
} }

5
EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_16_R1/tasks/CheckTask.java
View File

@ -41,10 +41,7 @@ public class CheckTask extends BukkitRunnable {
for(Player player : Bukkit.getWorld(worldName).getPlayers()) { for(Player player : Bukkit.getWorld(worldName).getPlayers()) {
for(Entity ent : player.getNearbyEntities(d, d, d)) { for(Entity ent : player.getNearbyEntities(d, d, d)) {
net.minecraft.server.v1_16_R1.Entity nms = ((CraftEntity)ent).getHandle(); net.minecraft.server.v1_16_R1.Entity nms = ((CraftEntity)ent).getHandle();
if(cps.playerChunkMap.trackedEntities.containsKey(nms.getId())) { if(cps.playerChunkMap.trackedEntities.containsKey(nms.getId()) || !nms.valid) {
continue;
}
if(!nms.valid) {
continue; continue;
} }
trackAgain.add(nms); trackAgain.add(nms);