diff options
| author | Ash <101582426+ashuntu@users.noreply.github.com> | 2023-07-28 21:22:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-28 21:22:35 +0000 |
| commit | d133b40b254630f988c57c1111e4659023324edc (patch) | |
| tree | 96217214a39945ef04e0d191d960481825ac65da /libraries | |
| parent | 51d7a6289e1cf2df463ae8d7c0b08b4a61faea3c (diff) | |
| parent | bdec11c501a6438706f62465d89f2344f7856342 (diff) | |
| download | PrismLauncher-d133b40b254630f988c57c1111e4659023324edc.tar.gz PrismLauncher-d133b40b254630f988c57c1111e4659023324edc.tar.bz2 PrismLauncher-d133b40b254630f988c57c1111e4659023324edc.zip | |
Merge branch 'PrismLauncher:develop' into develop
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/README.md | 2 | ||||
| m--------- | libraries/libnbtplusplus | 0 | ||||
| -rw-r--r-- | libraries/murmur2/src/MurmurHash2.cpp | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/libraries/README.md b/libraries/README.md index 4da11314..e75a381e 100644 --- a/libraries/README.md +++ b/libraries/README.md @@ -61,7 +61,7 @@ The `standard` and `legacy` launchers are available. Example (some parts have been censored): -``` +```text mod legacyjavafixer-1.0 mainClass net.minecraft.launchwrapper.Launch param --username diff --git a/libraries/libnbtplusplus b/libraries/libnbtplusplus -Subproject 2203af7eeb48c45398139b583615134efd8d407 +Subproject a5e8fd52b8bf4ab5d5bcc042b2a247867589985 diff --git a/libraries/murmur2/src/MurmurHash2.cpp b/libraries/murmur2/src/MurmurHash2.cpp index c13608f0..e7312795 100644 --- a/libraries/murmur2/src/MurmurHash2.cpp +++ b/libraries/murmur2/src/MurmurHash2.cpp @@ -89,8 +89,10 @@ void FourBytes_MurmurHash2(const unsigned char* data, IncrementalHashInfo& prev) switch (prev.len) { case 3: prev.h ^= data[2] << 16; + /* fall through */ case 2: prev.h ^= data[1] << 8; + /* fall through */ case 1: prev.h ^= data[0]; prev.h *= m; |