0xf8/baritone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

synchronize MemoryBehavior, fixes #198

Browse Source
This commit is contained in:
leijurv 2018-10-07 21:55:03 -07:00 committed by Leijurv
parent 60c29fd159
commit e17cc79cb3
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/baritone/behavior/MemoryBehavior.java
View File

@ -50,14 +50,14 @@ public final class MemoryBehavior extends Behavior implements IMemoryBehavior, H
private MemoryBehavior() {} private MemoryBehavior() {}
@Override @Override
public void onPlayerUpdate(PlayerUpdateEvent event) { public synchronized void onPlayerUpdate(PlayerUpdateEvent event) {
if (event.getState() == EventState.PRE) { if (event.getState() == EventState.PRE) {
updateInventory(); updateInventory();
} }
} }
@Override @Override
public void onSendPacket(PacketEvent event) { public synchronized void onSendPacket(PacketEvent event) {
Packet p = event.getPacket(); Packet p = event.getPacket();
if (event.getState() == EventState.PRE) { if (event.getState() == EventState.PRE) {
@ -83,7 +83,7 @@ public final class MemoryBehavior extends Behavior implements IMemoryBehavior, H
} }
@Override @Override
public void onReceivePacket(PacketEvent event) { public synchronized void onReceivePacket(PacketEvent event) {
Packet p = event.getPacket(); Packet p = event.getPacket();
if (event.getState() == EventState.PRE) { if (event.getState() == EventState.PRE) {
@ -130,13 +130,14 @@ public final class MemoryBehavior extends Behavior implements IMemoryBehavior, H
} }
@Override @Override
public final RememberedInventory getInventoryByPos(BlockPos pos) { public final synchronized RememberedInventory getInventoryByPos(BlockPos pos) {
return this.getCurrentContainer().rememberedInventories.get(pos); return this.getCurrentContainer().rememberedInventories.get(pos);
} }
@Override @Override
public final Map<BlockPos, IRememberedInventory> getRememberedInventories() { public final synchronized Map<BlockPos, IRememberedInventory> getRememberedInventories() {
return Collections.unmodifiableMap(this.getCurrentContainer().rememberedInventories); // make a copy since this map is modified from the packet thread
return new HashMap<>(this.getCurrentContainer().rememberedInventories);
} }
private static final class WorldDataContainer { private static final class WorldDataContainer {
@ -213,7 +214,7 @@ public final class MemoryBehavior extends Behavior implements IMemoryBehavior, H
@Override @Override
public final List<ItemStack> getContents() { public final List<ItemStack> getContents() {
return this.items; return Collections.unmodifiableList(this.items);
} }
@Override @Override