Upstream
/
Essentials
mirror of https://github.com/EssentialsX/Essentials.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix trade signs not updating with full inventories (#5574) 

Starting with 1.19, sign block states are no longer persistent causing them to become dead after any call to Sign#update. 
To avoid this, ensure we either always get the latest block state or update the block state after any call to Sign#update.
This commit is contained in:
Josh Roy 2023-11-10 21:23:10 -05:00 committed by GitHub
parent 50c4d04b02
commit c68b277782
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Essentials/src/main/java/com/earth2me/essentials/signs/EssentialsSign.java
View File

@ -508,7 +508,7 @@ public class EssentialsSign {
static class EventSign implements ISign {
private final transient SignChangeEvent event;
private final transient Block block;
private final transient Sign sign;
private transient Sign sign;
EventSign(final SignChangeEvent event) {
this.event = event;
@ -543,22 +543,21 @@ public class EssentialsSign {
@Override
public void updateSign() {
sign.update();
sign = (Sign) block.getState();
}
}
static class BlockSign implements ISign {
private final transient Sign sign;
private final transient Block block;
BlockSign(final Block block) {
this.block = block;
this.sign = (Sign) block.getState();
}
@Override
public final String getLine(final int index) {
final StringBuilder builder = new StringBuilder();
for (final char c : sign.getLine(index).toCharArray()) {
for (final char c : getSign().getLine(index).toCharArray()) {
if (c < 0xF700 || c > 0xF747) {
builder.append(c);
}
@ -569,7 +568,7 @@ public class EssentialsSign {
@Override
public final void setLine(final int index, final String text) {
sign.setLine(index, text);
getSign().setLine(index, text);
updateSign();
}
@ -578,9 +577,15 @@ public class EssentialsSign {
return block;
}
private Sign getSign() {
// Starting in 1.19, the block state is no longer persistent I guess? We must get it every time to prevent
// sign updates from not taking effect.
return (Sign) block.getState();
}
@Override
public final void updateSign() {
sign.update();
getSign().update();
}
}
}