diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-02-27 22:48:49 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-02-27 22:48:49 +0100 |
| commit | 528467bc5c514d8ef193c4e9dd06fb5aeb9f0dd9 (patch) | |
| tree | 95b00086294685b2ec426a401d6d570d19d8426a | |
| parent | Fixed sheep ASSERTing sometimes (diff) | |
| download | cuberite-528467bc5c514d8ef193c4e9dd06fb5aeb9f0dd9.tar cuberite-528467bc5c514d8ef193c4e9dd06fb5aeb9f0dd9.tar.gz cuberite-528467bc5c514d8ef193c4e9dd06fb5aeb9f0dd9.tar.bz2 cuberite-528467bc5c514d8ef193c4e9dd06fb5aeb9f0dd9.tar.lz cuberite-528467bc5c514d8ef193c4e9dd06fb5aeb9f0dd9.tar.xz cuberite-528467bc5c514d8ef193c4e9dd06fb5aeb9f0dd9.tar.zst cuberite-528467bc5c514d8ef193c4e9dd06fb5aeb9f0dd9.zip | |
| -rw-r--r-- | src/WorldStorage/FireworksSerializer.cpp | 3 | ||||
| -rw-r--r-- | src/WorldStorage/FireworksSerializer.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/WorldStorage/FireworksSerializer.cpp b/src/WorldStorage/FireworksSerializer.cpp index eeb4e39ee..7f5077912 100644 --- a/src/WorldStorage/FireworksSerializer.cpp +++ b/src/WorldStorage/FireworksSerializer.cpp @@ -2,7 +2,6 @@ #include "Globals.h" #include "FireworksSerializer.h" #include "WorldStorage/FastNBT.h" -#include <sstream> @@ -219,7 +218,7 @@ void cFireworkItem::FadeColoursFromString(const AString & a_String, cFireworkIte -int GetVanillaColourCodeFromDye(short a_DyeMeta) +int cFireworkItem::GetVanillaColourCodeFromDye(short a_DyeMeta) { /* Colours are supposed to be calculated via: R << 16 + G << 8 + B diff --git a/src/WorldStorage/FireworksSerializer.h b/src/WorldStorage/FireworksSerializer.h index 475d80bda..37fb6c883 100644 --- a/src/WorldStorage/FireworksSerializer.h +++ b/src/WorldStorage/FireworksSerializer.h @@ -77,7 +77,7 @@ public: static void FadeColoursFromString(const AString & a_String, cFireworkItem & a_FireworkItem); /** Returns a colour code for fireworks used by the network code */ - static const inline int GetVanillaColourCodeFromDye(short a_DyeMeta); + static int GetVanillaColourCodeFromDye(short a_DyeMeta); bool m_HasFlicker; bool m_HasTrail; |