Prevent Music Overlapping Memory Leak

This commit is contained in:
Kam committed 2024-02-20 20:30:18 -05:00
1 parent 3507cb85c5
commit 6f5fd25a24
2 files changed
+24 -26

No files matched your search

+17 -16
View File
@@ -1,5 +1,6 @@
package noppes.npcs.roles;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -14,12 +15,12 @@ import java.util.List;
public class JobBard extends JobInterface{
public int minRange = 2;
public int maxRange = 64;
public boolean isStreamer = true;
public boolean hasOffRange = true;
public String song = "";
private EnumBardInstrument instrument = EnumBardInstrument.Banjo;
public JobBard(EntityNPCInterface npc) {
@@ -38,7 +39,7 @@ public class JobBard extends JobInterface{
nbttagcompound.setInteger("BardInstrument", instrument.ordinal());
nbttagcompound.setBoolean("BardStreamer", isStreamer);
nbttagcompound.setBoolean("BardHasOff", hasOffRange);
return nbttagcompound;
}
@@ -51,7 +52,7 @@ public class JobBard extends JobInterface{
isStreamer = nbttagcompound.getBoolean("BardStreamer");
hasOffRange = nbttagcompound.getBoolean("BardHasOff");
}
public void setInstrument(int i) {
if(CustomItems.banjo == null)
return;
@@ -87,16 +88,11 @@ public class JobBard extends JobInterface{
public EnumBardInstrument getInstrument(){
return instrument;
}
private long ticks = 0;
public void onLivingUpdate() {
if(!npc.isRemote())
if(!npc.isRemote() || song.isEmpty())
return;
ticks++;
if(ticks % 10 != 0 )
return;
if(song.isEmpty())
return;
if(!MusicController.Instance.isPlaying(song)){
if(!MusicController.Instance.isPlaying(song)){
List<EntityPlayer> list = npc.worldObj.getEntitiesWithinAABB(EntityPlayer.class, npc.boundingBox.expand(minRange, minRange/2, minRange));
if(!list.contains(CustomNpcs.proxy.getPlayer()))
return;
@@ -104,18 +100,23 @@ public class JobBard extends JobInterface{
MusicController.Instance.playStreaming(song, npc);
else
MusicController.Instance.playMusic(song, npc);
}else if(MusicController.Instance.playingEntity != npc){
}
else if(MusicController.Instance.playingEntity != npc){
EntityPlayer player = CustomNpcs.proxy.getPlayer();
if(npc.getDistanceSqToEntity(player) < MusicController.Instance.playingEntity.getDistanceSqToEntity(player)){
MusicController.Instance.playingEntity = npc;
}
}else if(hasOffRange){
}
else if(hasOffRange){
List<EntityPlayer> list = npc.worldObj.getEntitiesWithinAABB(EntityPlayer.class, npc.boundingBox.expand(maxRange, maxRange/2, maxRange));
if(!list.contains(CustomNpcs.proxy.getPlayer()))
MusicController.Instance.stopMusic();
}
if(MusicController.Instance.isPlaying(song)) {
Minecraft.getMinecraft().mcMusicTicker.field_147676_d = 12000;
}
}
@Override