summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHownaer <franzi.moos@googlemail.com>2014-08-29 00:42:33 +0200
committerHownaer <franzi.moos@googlemail.com>2014-08-29 00:42:33 +0200
commitc4d7f7996b0dcd784f5e1ccc8553b062c3ac96b6 (patch)
tree09e0a14bb1ff3690d2afb4a3a343537995593a84
parentFire can be destroyed with the sword in creative-mode (diff)
downloadcuberite-c4d7f7996b0dcd784f5e1ccc8553b062c3ac96b6.tar
cuberite-c4d7f7996b0dcd784f5e1ccc8553b062c3ac96b6.tar.gz
cuberite-c4d7f7996b0dcd784f5e1ccc8553b062c3ac96b6.tar.bz2
cuberite-c4d7f7996b0dcd784f5e1ccc8553b062c3ac96b6.tar.lz
cuberite-c4d7f7996b0dcd784f5e1ccc8553b062c3ac96b6.tar.xz
cuberite-c4d7f7996b0dcd784f5e1ccc8553b062c3ac96b6.tar.zst
cuberite-c4d7f7996b0dcd784f5e1ccc8553b062c3ac96b6.zip
Diffstat (limited to '')
-rw-r--r--MCServer/crafting.txt2
-rw-r--r--src/CraftingRecipes.cpp7
-rw-r--r--src/StringUtils.h4
3 files changed, 8 insertions, 5 deletions
diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index 60cda0673..684294bb3 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -84,7 +84,7 @@ BrickSlab, 6 = BrickBlock, 1:1, 2:1, 3:1
StonebrickSlab, 6 = StoneBrick, 1:1, 2:1, 3:1
NetherbrickSlab, 6 = NetherBrick, 1:1, 2:1, 3:1
Quartzslab, 6 = QuartzBlock, 1:1, 2:1, 3:1
-snow, 6 = SnowBlock, 1:1, 2:1, 3:1
+snow, 6 = SnowBlock, 1:1, 2:1, 3:1
# Stairs:
WoodStairs, 4 = Planks, 1:1, 1:2, 2:2, 1:3, 2:3, 3:3
diff --git a/src/CraftingRecipes.cpp b/src/CraftingRecipes.cpp
index 2d80ecaf8..223184c64 100644
--- a/src/CraftingRecipes.cpp
+++ b/src/CraftingRecipes.cpp
@@ -1,4 +1,4 @@
-
+
// CraftingRecipes.cpp
// Interfaces to the cCraftingRecipes class representing the storage of crafting recipes
@@ -366,7 +366,10 @@ void cCraftingRecipes::ClearRecipes(void)
void cCraftingRecipes::AddRecipeLine(int a_LineNum, const AString & a_RecipeLine)
{
- AStringVector Sides = StringSplit(a_RecipeLine, "=");
+ AString RecipeLine(a_RecipeLine);
+ RecipeLine.erase(std::remove(RecipeLine.begin(), RecipeLine.end(), ' '), RecipeLine.end());
+
+ AStringVector Sides = StringSplit(RecipeLine, "=");
if (Sides.size() != 2)
{
LOGWARNING("crafting.txt: line %d: A single '=' was expected, got %d", a_LineNum, (int)Sides.size() - 1);
diff --git a/src/StringUtils.h b/src/StringUtils.h
index 4a4c267c7..c48ca6051 100644
--- a/src/StringUtils.h
+++ b/src/StringUtils.h
@@ -119,7 +119,7 @@ bool StringToInteger(const AString& a_str, T& a_Num)
{
for (size_t size = a_str.size(); i < size; i++)
{
- if ((a_str[i] <= '0') || (a_str[i] >= '9'))
+ if ((a_str[i] < '0') || (a_str[i] > '9'))
{
return false;
}
@@ -140,7 +140,7 @@ bool StringToInteger(const AString& a_str, T& a_Num)
{
for (size_t size = a_str.size(); i < size; i++)
{
- if ((a_str[i] <= '0') || (a_str[i] >= '9'))
+ if ((a_str[i] < '0') || (a_str[i] > '9'))
{
return false;
}