diff options
| author | Aikar <[email protected]> | 2020-05-20 00:51:28 -0400 |
|---|---|---|
| committer | Aikar <[email protected]> | 2020-05-20 00:55:30 -0400 |
| commit | c82b292ab031baa576fa55fe7174a5d3ea8eb794 (patch) | |
| tree | ba19a4f7ddedb711749402efe61df8c6c405c3c9 /scripts | |
| parent | 632744725942731bb4d15021215f8b9b1042ae03 (diff) | |
| download | Paper-c82b292ab031baa576fa55fe7174a5d3ea8eb794.tar.gz Paper-c82b292ab031baa576fa55fe7174a5d3ea8eb794.zip | |
Fix pooled buffer leak resulting in dynmap black spots - Fixes #3386
Dynmap accessed the raw bytes because it utilized NBT locally, but the
NBTTagcompound was garbage collected while the bytes were still being used.
This will return getBytes() back to being safe, and add a new PoolSafe method
that will prevent the additional allocations for general chunk loading.
Also fixed applyPatches for people with paths in their working directory
if they have mcdev sources built.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/applyPatches.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/applyPatches.sh b/scripts/applyPatches.sh index ef34ca0105..e4c073fda2 100755 --- a/scripts/applyPatches.sh +++ b/scripts/applyPatches.sh @@ -92,14 +92,14 @@ echo "Importing MC Dev" ./scripts/importmcdev.sh "$basedir" || exit 1 # Apply paper -cd "$basedir" ( applyPatch "work/Spigot/Spigot-API" Paper-API HEAD && applyPatch "work/Spigot/Spigot-Server" Paper-Server HEAD + cd "$basedir" # if we have previously ran ./paper mcdev, update it if [ -d "$workdir/Minecraft/$minecraftversion/src" ]; then - $basedir/scripts/makemcdevsrc.sh $basedir + ./scripts/makemcdevsrc.sh "$basedir" fi ) || ( echo "Failed to apply Paper Patches" |