Changed world_end to world_the_end #3531 #3538

Bond-009 · 2017-01-15T12:20:15Z

NiLSPACE · 2017-01-15T12:26:04Z

You should also change the linked worlds over.

SafwatHalaby

I think both _end and _the_end should be supported to prevent confusion for existing installations, with _the_end being the default. Doing this requires trivial changes.

SafwatHalaby · 2017-01-15T13:30:54Z

src/Root.cpp

@@ -376,11 +376,11 @@ void cRoot::LoadWorlds(cSettingsRepositoryInterface & a_Settings, bool a_IsNewIn
 	{
 		a_Settings.AddValue("Worlds", "DefaultWorld", "world");
 		a_Settings.AddValue("Worlds", "World", "world_nether");
-		a_Settings.AddValue("Worlds", "World", "world_end");
+		a_Settings.AddValue("Worlds", "World", "world_the_end");


This code block is fine and it does not affect existing installations.

SafwatHalaby · 2017-01-15T13:33:19Z

src/Root.cpp

@@ -451,10 +451,10 @@ void cRoot::LoadWorlds(cSettingsRepositoryInterface & a_Settings, bool a_IsNewIn
 			}
 			NewWorld = new cWorld(WorldName.c_str(), dimNether, LinkTo);
 		}
-		// if the world is called x_end
+		// if the world is called x_the_end
 		else if ((LowercaseName.size() > EndAppend.size()) && (LowercaseName.substr(LowercaseName.size() - EndAppend.size()) == EndAppend))


The problem here is that if a player removes their existing world_end, it would be recreated as an overworld called world_end. I think this code block should catch both _end and _the_end.

EndAppend1.= "_the_end" EndAppend2 = "_end" ... else if ( ((LowercaseName.size() > EndAppend1.size()) && (LowercaseName.substr(LowercaseName.size() - EndAppend1.size()) == EndAppend1)) || ((LowercaseName.size() > EndAppend2.size()) && (LowercaseName.substr(LowercaseName.size() - EndAppend2.size()) == EndAppend2)) )

SafwatHalaby · 2017-01-15T13:37:53Z

src/Root.cpp

@@ -451,10 +451,10 @@ void cRoot::LoadWorlds(cSettingsRepositoryInterface & a_Settings, bool a_IsNewIn
 			}
 			NewWorld = new cWorld(WorldName.c_str(), dimNether, LinkTo);
 		}
-		// if the world is called x_end
+		// if the world is called x_the_end


"if the world is called x_the_end or x_end" (see below)

SafwatHalaby · 2017-01-15T13:38:00Z

src/Root.cpp

 			- Create a world.ini with a dimension type of "overworld".
 			- If a world called x_nether exists, set it as x's nether world.
 			- Otherwise set x's nether world to blank.h
-			- If a world called x_end  exists, set it as x's end world.
+			- If a world called x_the_end  exists, set it as x's end world.


"if the world is called x_the_end or x_end" (see below)

SafwatHalaby · 2017-01-15T13:38:40Z

src/Root.cpp


-		- If the world name is x (and doesn't end with _end or _nether)
+		- If the world name is x (and doesn't end with _the_end or _nether)


and doesn't end with _the_end or _end or _nether (see below)

SafwatHalaby · 2017-01-15T13:39:13Z

src/Root.cpp

-		- If the world name is x_end, create a world.ini with the dimension type "end".
-			- If a world called x exists, set it as x_end's overworld.
-			- Otherwise set the default world as x_end's overworld.
+		- If the world name is x_the_end, create a world.ini with the dimension type "end".


"if the world name is x_the_end or x_end" (see below)

SafwatHalaby · 2017-01-23T17:18:00Z

This looks fine now. CircleCi is complaining though, and someone should perform ingame testing before merge.

madmaxoft · 2017-01-23T17:25:37Z

src/World.cpp

+ 			if (cRoot::Get()->GetWorld(MyEndName) == nullptr)
+ 			MyEndName = "";
+ 		}
+


There's indentation by spaces (yuck) here, and missing braces and indent around the if-controlled block

SafwatHalaby · 2017-01-23T17:26:43Z

src/Root.cpp


-		- If the world name is x (and doesn't end with _end or _nether)
+		- If the world name is x (and doesn't end with _the_end, _end or _nether)
 			- Create a world.ini with a dimension type of "overworld".
 			- If a world called x_nether exists, set it as x's nether world.
 			- Otherwise set x's nether world to blank.h


There's a stray "h" here.

SafwatHalaby · 2017-01-23T17:28:02Z

src/World.cpp

+ 		{
+ 			MyEndName = GetName() + "_end";
+ 			if (cRoot::Get()->GetWorld(MyEndName) == nullptr)
+ 			MyEndName = "";


Indent missing.

sphinxc0re · 2017-02-14T18:51:33Z

@Bond-009 Are you still working on this? Could you give us an update?

Bond-009 · 2017-02-14T19:20:00Z

I'm done with this, but it still needs testing.

sphinxc0re · 2017-02-23T22:37:44Z

@Bond-009 There are still change requests to be fulfilled. Also please rebase your branch onto the current master branch of the canon repo

Bond-009 · 2017-02-24T06:13:06Z

The only change request that is not done is the one with the stray "h" and I don't about what he is talking.

madmaxoft · 2017-02-24T09:01:59Z

There's an extra h on the line above that comment, not too relevant to this PR. Merging.

Changed world_end to world_the_end

ed7d6e0

Changed the linked worlds

b0a4e45

SafwatHalaby self-requested a review January 15, 2017 13:15

SafwatHalaby requested changes Jan 15, 2017

View reviewed changes

SafwatHalaby mentioned this pull request Jan 15, 2017

Update world creation notes cuberite/users-manual#82

Closed

Bond-009 added 2 commits January 17, 2017 17:17

Added checks for _end

adf8151

Fixed a mistake

af7cf4b

SafwatHalaby added internals/worlds & chunks poweruser/configuration labels Jan 17, 2017

SafwatHalaby approved these changes Jan 23, 2017

View reviewed changes

SafwatHalaby added the status/ingame-testing-needed label Jan 23, 2017

madmaxoft requested changes Jan 23, 2017

View reviewed changes

SafwatHalaby reviewed Jan 23, 2017

View reviewed changes

Bond-009 added 2 commits January 23, 2017 18:49

Fixed indent

b9d37e8

Removed spaces

ae61f85

madmaxoft approved these changes Feb 24, 2017

View reviewed changes

madmaxoft merged commit ca3aa4c into cuberite:master Feb 24, 2017

Bond-009 deleted the endsuffix branch February 24, 2017 18:46

Bond-009 mentioned this pull request Mar 20, 2017

The End suffix doesn’t match bukkit/spigot/sponge #3531

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Changed world_end to world_the_end #3531 #3538

Changed world_end to world_the_end #3531 #3538

Bond-009 commented Jan 15, 2017 •

edited

NiLSPACE commented Jan 15, 2017

SafwatHalaby left a comment

SafwatHalaby Jan 15, 2017

SafwatHalaby Jan 15, 2017 •

edited

SafwatHalaby Jan 15, 2017 •

edited

SafwatHalaby Jan 15, 2017

SafwatHalaby Jan 15, 2017

SafwatHalaby Jan 15, 2017

SafwatHalaby Jan 15, 2017

SafwatHalaby commented Jan 23, 2017

madmaxoft Jan 23, 2017

Bond-009 Jan 23, 2017

SafwatHalaby Jan 23, 2017

SafwatHalaby Jan 23, 2017

sphinxc0re commented Feb 14, 2017

Bond-009 commented Feb 14, 2017

sphinxc0re commented Feb 23, 2017

Bond-009 commented Feb 24, 2017

madmaxoft commented Feb 24, 2017


		- If the world name is x (and doesn't end with _end or _nether)
		- If the world name is x (and doesn't end with _the_end or _nether)

Changed world_end to world_the_end #3531 #3538

Changed world_end to world_the_end #3531 #3538

Conversation

Bond-009 commented Jan 15, 2017 • edited

NiLSPACE commented Jan 15, 2017

SafwatHalaby left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SafwatHalaby Jan 15, 2017 • edited

Choose a reason for hiding this comment

SafwatHalaby Jan 15, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SafwatHalaby commented Jan 23, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sphinxc0re commented Feb 14, 2017

Bond-009 commented Feb 14, 2017

sphinxc0re commented Feb 23, 2017

Bond-009 commented Feb 24, 2017

madmaxoft commented Feb 24, 2017

Bond-009 commented Jan 15, 2017 •

edited

SafwatHalaby Jan 15, 2017 •

edited

SafwatHalaby Jan 15, 2017 •

edited