mirror of
https://github.com/burrow-dev/burrow-server.git
synced 2026-11-18 17:27:50 -05:00
fix(avatar): prevent player displacement when sitting or sleeping
Replace AvatarManager.checkIfAnimatingOnTopOf with P-code to fix an issue where players were pushed off others within 100 pixels. This also bypasses decompilation errors in the original class loops.
This commit is contained in:
1 parent
783feb7788
commit
3c2053f434
3 files changed
+27
-1
No files matched your search
@@ -0,0 +1,20 @@
|
||||
method
|
||||
name "checkIfAnimatingOnTopOf"
|
||||
flag HAS_PARAM_NAMES
|
||||
param QName(PackageNamespace(""),"int")
|
||||
paramname "userId"
|
||||
returns QName(PackageNamespace(""),"void")
|
||||
|
||||
body
|
||||
maxstack 1
|
||||
localcount 2
|
||||
initscopedepth 0
|
||||
maxscopedepth 1
|
||||
|
||||
code
|
||||
getlocal0
|
||||
pushscope
|
||||
returnvoid
|
||||
end ; code
|
||||
end ; body
|
||||
end ; method
|
||||
Binary file not shown.
@@ -18,6 +18,11 @@
|
||||
# of its methods are replaced as P-code: the tutorial and "what's new" video
|
||||
# lists return at once when empty, as this server sends them (they threw).
|
||||
# 3830 and 3832 are those method bodies' places in the untouched client.
|
||||
#
|
||||
# avatar.AvatarManager's checkIfAnimatingOnTopOf is replaced as P-code too
|
||||
# (the class's loops decompile wrong): it pushed a player off another who was
|
||||
# sitting, sleeping or the like within 100 pixels, so players can sit and
|
||||
# sleep side by side now. 2394 is that method body's place.
|
||||
set -e
|
||||
cd "$(dirname "$(readlink -f "$0")")/.."
|
||||
out=${1:-swf/ajclient.swf}
|
||||
@@ -103,5 +108,6 @@ java -cp "tools/ffdec/lib/*" tools/AddClass.java swf/ajclient.before-finder.swf
|
||||
java -jar tools/ffdec/ffdec-cli.jar -replace "$base" "$out" \
|
||||
gui.EmoticonUtility swf-src/EmoticonUtility.cinit.pcode 4839 \
|
||||
gui.BulletinBoard swf-src/BulletinBoard.onTutorialGLReceived.pcode 3830 \
|
||||
gui.BulletinBoard swf-src/BulletinBoard.onWhatsNewVideosLoaded.pcode 3832 $args | grep -v "^Replac\|EXPERIMENTAL" || true
|
||||
gui.BulletinBoard swf-src/BulletinBoard.onWhatsNewVideosLoaded.pcode 3832 \
|
||||
avatar.AvatarManager swf-src/AvatarManager.checkIfAnimatingOnTopOf.pcode 2394 $args | grep -v "^Replac\|EXPERIMENTAL" || true
|
||||
ls -l "$out"
|
||||
Reference in new issue
Block a user