Skip to content

Commit 569f4d5

Browse files
committed
2 parents 7a141af + 4694e40 commit 569f4d5

File tree

4 files changed

+18
-4
lines changed

4 files changed

+18
-4
lines changed

src/main/java/carpet/script/bundled/FileModule.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,14 @@ public static Tag read(File file)
7676
}
7777
catch (IOException e)
7878
{
79-
try
79+
// Copy of NbtIo.read(File) because that's now client-side only
80+
if (!file.exists())
81+
{
82+
return null;
83+
}
84+
try (DataInputStream in = new DataInputStream(new FileInputStream(file)))
8085
{
81-
return NbtIo.read(file);
86+
return NbtIo.read(in);
8287
}
8388
catch (IOException ioException)
8489
{

src/main/java/carpet/script/language/DataStructures.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ else if (lv.size() == 2 && lv.get(1) instanceof ListValue)
5757
if (lv.size() == 1)
5858
{
5959
hwat = lv.get(0);
60-
delimiter = StringValue.EMPTY;
60+
delimiter = null;
6161
}
6262
else if (lv.size() == 2)
6363
{

src/main/java/carpet/script/value/ListValue.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,11 @@ public Value slice(long fromDesc, Long toDesc)
350350
@Override
351351
public Value split(Value delimiter) {
352352
ListValue result = new ListValue();
353+
if (delimiter == null)
354+
{
355+
this.forEach(item -> result.items.add(of(item)));
356+
return result;
357+
}
353358
int startIndex = 0;
354359
int index = 0;
355360
for (Value val : this.items)

src/main/java/carpet/script/value/Value.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,11 @@ public Value slice(long fromDesc, Long toDesc)
193193

194194
public Value split(Value delimiter)
195195
{
196-
try
196+
if (delimiter == null)
197+
{
198+
delimiter = StringValue.EMPTY;
199+
}
200+
try
197201
{
198202
return ListValue.wrap(Arrays.stream(getString().split(delimiter.getString())).map(StringValue::new).collect(Collectors.toList()));
199203
}

0 commit comments

Comments
 (0)