Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
ItsTheSky committed May 22, 2021
2 parents 7770d6b + f59ee1e commit 5b0b27e
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ protected void execute(Event e) {
Integer y = exprY.getSingle(e);
if (image1 == null || image2 == null || y == null || x == null) return;
new Thread(() -> {
BufferedImage newImage = new BufferedImage(image1.getWidth(), image1.getHeight(), Utils.getDefaultType());
BufferedImage newImage = new BufferedImage(image2.getWidth(), image2.getHeight(), Utils.getDefaultType());
Graphics2D g2d = newImage.createGraphics();
g2d.drawImage(image2, x, y, null);
g2d.drawImage(image2, 0, 0, null);
g2d.drawImage(image1, x, y, null);
g2d.dispose();
Utils.setSkriptVariable((Variable) exprImage2, newImage, e);
Expand Down

0 comments on commit 5b0b27e

Please sign in to comment.