flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Corrected particles (#3577)

Browse Source 
Fixes wrong IDs causing particles to become unknown to the server.
This commit is contained in:
mathiascode 2017-02-26 02:31:08 +02:00 committed by Julian Laubstein
parent 6fe863c2ad
commit 65ee749013
2 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Protocol/Protocol_1_8.cpp
View File

@ -1707,9 +1707,8 @@ bool cProtocol_1_8_0::CompressPacket(const AString & a_Packet, AString & a_Compr
int cProtocol_1_8_0::GetParticleID(const AString & a_ParticleName) int cProtocol_1_8_0::GetParticleID(const AString & a_ParticleName)
{ {
static bool IsInitialized = false;
static std::map<AString, int> ParticleMap; static std::map<AString, int> ParticleMap;
if (!IsInitialized) if (ParticleMap.empty())
{ {
// Initialize the ParticleMap: // Initialize the ParticleMap:
ParticleMap["explode"] = 0; ParticleMap["explode"] = 0;
@ -1733,7 +1732,7 @@ int cProtocol_1_8_0::GetParticleID(const AString & a_ParticleName)
ParticleMap["dripwater"] = 18; ParticleMap["dripwater"] = 18;
ParticleMap["driplava"] = 19; ParticleMap["driplava"] = 19;
ParticleMap["angryvillager"] = 20; ParticleMap["angryvillager"] = 20;
ParticleMap["happyVillager"] = 21; ParticleMap["happyvillager"] = 21;
ParticleMap["townaura"] = 22; ParticleMap["townaura"] = 22;
ParticleMap["note"] = 23; ParticleMap["note"] = 23;
ParticleMap["portal"] = 24; ParticleMap["portal"] = 24;
@ -1754,16 +1753,13 @@ int cProtocol_1_8_0::GetParticleID(const AString & a_ParticleName)
ParticleMap["droplet"] = 39; ParticleMap["droplet"] = 39;
ParticleMap["take"] = 40; ParticleMap["take"] = 40;
ParticleMap["mobappearance"] = 41; ParticleMap["mobappearance"] = 41;
ParticleMap["ironcrack"] = 42; ParticleMap["dragonbreath"] = 42;
ParticleMap["blockcrack"] = 43; ParticleMap["endrod"] = 43;
ParticleMap["blockdust"] = 44; ParticleMap["damageindicator"] = 44;
ParticleMap["endRod"] = 45; ParticleMap["sweepattack"] = 45;
ParticleMap["dragonbreath"] = 46; ParticleMap["fallingdust"] = 46;
ParticleMap["damageIndicator"] = 47; ParticleMap["totem"] = 47;
ParticleMap["sweepAttack"] = 48; ParticleMap["spit"] = 48;
ParticleMap["fallingdust"] = 49;
ParticleMap["spit"] = 50;
ParticleMap["totem"] = 51;
} }
AString ParticleName = StrToLower(a_ParticleName); AString ParticleName = StrToLower(a_ParticleName);

22
src/Protocol/Protocol_1_9.cpp
View File

@ -1724,9 +1724,8 @@ bool cProtocol_1_9_0::CompressPacket(const AString & a_Packet, AString & a_Compr
int cProtocol_1_9_0::GetParticleID(const AString & a_ParticleName) int cProtocol_1_9_0::GetParticleID(const AString & a_ParticleName)
{ {
static bool IsInitialized = false;
static std::map<AString, int> ParticleMap; static std::map<AString, int> ParticleMap;
if (!IsInitialized) if (ParticleMap.empty())
{ {
// Initialize the ParticleMap: // Initialize the ParticleMap:
ParticleMap["explode"] = 0; ParticleMap["explode"] = 0;
@ -1750,7 +1749,7 @@ int cProtocol_1_9_0::GetParticleID(const AString & a_ParticleName)
ParticleMap["dripwater"] = 18; ParticleMap["dripwater"] = 18;
ParticleMap["driplava"] = 19; ParticleMap["driplava"] = 19;
ParticleMap["angryvillager"] = 20; ParticleMap["angryvillager"] = 20;
ParticleMap["happyVillager"] = 21; ParticleMap["happyvillager"] = 21;
ParticleMap["townaura"] = 22; ParticleMap["townaura"] = 22;
ParticleMap["note"] = 23; ParticleMap["note"] = 23;
ParticleMap["portal"] = 24; ParticleMap["portal"] = 24;
@ -1771,16 +1770,13 @@ int cProtocol_1_9_0::GetParticleID(const AString & a_ParticleName)
ParticleMap["droplet"] = 39; ParticleMap["droplet"] = 39;
ParticleMap["take"] = 40; ParticleMap["take"] = 40;
ParticleMap["mobappearance"] = 41; ParticleMap["mobappearance"] = 41;
ParticleMap["ironcrack"] = 42; ParticleMap["dragonbreath"] = 42;
ParticleMap["blockcrack"] = 43; ParticleMap["endrod"] = 43;
ParticleMap["blockdust"] = 44; ParticleMap["damageindicator"] = 44;
ParticleMap["endRod"] = 45; ParticleMap["sweepattack"] = 45;
ParticleMap["dragonbreath"] = 46; ParticleMap["fallingdust"] = 46;
ParticleMap["damageIndicator"] = 47; ParticleMap["totem"] = 47;
ParticleMap["sweepAttack"] = 48; ParticleMap["spit"] = 48;
ParticleMap["fallingdust"] = 49;
ParticleMap["spit"] = 50;
ParticleMap["totem"] = 51;
} }
AString ParticleName = StrToLower(a_ParticleName); AString ParticleName = StrToLower(a_ParticleName);